David Woodhouse 67577927e8 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git ... Conflicts: drivers/mtd/mtd_blkdevs.c Merge Grant's device-tree bits so that we can apply the subsequent fixes. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>		2010-10-30 12:35:11 +01:00
..
alpha	Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-irqflags	2010-10-21 14:37:27 -07:00
arm	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git	2010-10-30 12:35:11 +01:00
avr32	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
blackfin	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
cris	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2010-10-22 19:59:04 -07:00
frv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2010-10-22 19:59:04 -07:00
h8300	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
ia64	Merge branch 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2010-10-24 12:47:25 -07:00
m32r	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
m68k	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu	2010-10-25 07:44:27 -07:00
m68knommu	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu	2010-10-25 07:44:27 -07:00
microblaze	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-10-25 08:19:14 -07:00
mips	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git	2010-10-30 12:35:11 +01:00
mn10300	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2010-10-22 19:59:04 -07:00
parisc	Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl	2010-10-22 10:43:11 -07:00
powerpc	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git	2010-10-30 12:35:11 +01:00
s390	Merge branch 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2010-10-24 12:47:25 -07:00
score	Fix IRQ flag handling naming	2010-10-07 14:08:55 +01:00
sh	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2010-10-25 07:51:49 -07:00
sparc	Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-10-25 08:19:14 -07:00
tile	Merge git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic	2010-10-22 11:17:06 -07:00
um	Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl	2010-10-22 10:52:56 -07:00
x86	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
xtensa	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
.gitignore
Kconfig	Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core	2010-09-24 09:12:05 +02:00