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		2009-09-24 15:13:11 -07:00
..
alpha	alpha: AGP update (fixes compile failure)	2009-09-24 07:21:06 -07:00
arm	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-09-24 15:13:11 -07:00
avr32	Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next	2009-09-23 15:37:02 -07:00
blackfin	Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next	2009-09-23 15:37:02 -07:00
cris	Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next	2009-09-23 15:37:02 -07:00
frv	sysctl: remove "struct file *" argument of ->proc_handler	2009-09-24 07:21:04 -07:00
h8300	headers: utsname.h redux	2009-09-23 18:13:10 -07:00
ia64	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus	2009-09-23 18:14:11 -07:00
m32r	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus	2009-09-23 18:14:11 -07:00
m68k	headers: utsname.h redux	2009-09-23 18:13:10 -07:00
m68knommu	headers: utsname.h redux	2009-09-23 18:13:10 -07:00
microblaze	Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze	2009-09-24 09:01:44 -07:00
mips	sysctl: remove "struct file *" argument of ->proc_handler	2009-09-24 07:21:04 -07:00
mn10300	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus	2009-09-23 18:14:11 -07:00
parisc	fcntl: add F_[SG]ETOWN_EX	2009-09-24 07:21:01 -07:00
powerpc	Merge branch 'for-linus' of git://neil.brown.name/md	2009-09-24 07:55:29 -07:00
s390	sysctl: remove "struct file *" argument of ->proc_handler	2009-09-24 07:21:04 -07:00
score	Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next	2009-09-23 15:37:02 -07:00
sh	Merge branch 'for-linus' of git://neil.brown.name/md	2009-09-24 07:55:29 -07:00
sparc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus	2009-09-23 18:14:11 -07:00
um	Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus	2009-09-23 18:14:11 -07:00
x86	Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel	2009-09-24 10:30:41 -07:00
xtensa	Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next	2009-09-23 15:37:02 -07:00
.gitignore
Kconfig	oprofile: fix oprofile regression: select RING_BUFFER_ALLOW_SWAP	2009-09-17 15:53:42 -04:00