You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David S. Miller 8b3f6af863 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ ... Conflicts: drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/cpc-usb/TODO drivers/staging/cpc-usb/cpc-usb_drv.c drivers/staging/cpc-usb/cpc.h drivers/staging/cpc-usb/cpc_int.h drivers/staging/cpc-usb/cpcusb.h		16 years ago
..
alpha	alpha: AGP update (fixes compile failure)	16 years ago
arm	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	16 years ago
avr32	Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next	16 years ago
blackfin	Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next	16 years ago
cris	Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next	16 years ago
frv	sysctl: remove "struct file *" argument of ->proc_handler	16 years ago
h8300	headers: utsname.h redux	16 years ago
ia64	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus	16 years ago
m32r	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus	16 years ago
m68k	headers: utsname.h redux	16 years ago
m68knommu	headers: utsname.h redux	16 years ago
microblaze	Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze	16 years ago
mips	sysctl: remove "struct file *" argument of ->proc_handler	16 years ago
mn10300	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus	16 years ago
parisc	fcntl: add F_[SG]ETOWN_EX	16 years ago
powerpc	Merge branch 'for-linus' of git://neil.brown.name/md	16 years ago
s390	sysctl: remove "struct file *" argument of ->proc_handler	16 years ago
score	Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next	16 years ago
sh	Merge branch 'for-linus' of git://neil.brown.name/md	16 years ago
sparc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus	16 years ago
um	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus	16 years ago
x86	Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel	16 years ago
xtensa	Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next	16 years ago
.gitignore	…
Kconfig	oprofile: fix oprofile regression: select RING_BUFFER_ALLOW_SWAP	16 years ago