Grant Likely cf9b59e9d3 Merge remote branch 'origin' into secretlab/next-devicetree ... Merging in current state of Linus' tree to deal with merge conflicts and build failures in vio.c after merge. Conflicts: drivers/i2c/busses/i2c-cpm.c drivers/i2c/busses/i2c-mpc.c drivers/net/gianfar.c Also fixed up one line in arch/powerpc/kernel/vio.c to use the correct node pointer. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>		2010-05-22 00:36:56 -06:00
..
alpha	sysfs: add struct file* to bin_attr callbacks	2010-05-21 09:37:31 -07:00
arm	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx	2010-05-21 17:05:46 -07:00
avr32	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
blackfin	kgdb,blackfin: Add in kgdb_arch_set_pc for blackfin	2010-05-20 21:04:20 -05:00
cris	fix handling of offsets in cris eeprom.c, get rid of fake on-stack files	2010-05-21 18:31:29 -04:00
frv	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
h8300	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
ia64	Merge branch 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2010-05-21 17:16:21 -07:00
m32r	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
m68k	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
m68knommu
microblaze	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
mips	Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus	2010-05-21 15:23:54 -07:00
mn10300	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
parisc	Merge git://git.infradead.org/iommu-2.6	2010-05-21 17:25:01 -07:00
powerpc	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
s390	Merge git://git.infradead.org/iommu-2.6	2010-05-21 17:25:01 -07:00
score	add descriptive comment for TIF_MEMDIE task flag declaration.	2010-05-14 11:13:27 +02:00
sh	Merge git://git.infradead.org/iommu-2.6	2010-05-21 17:25:01 -07:00
sparc	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
um	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
x86	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2010-05-21 18:58:52 -07:00
xtensa	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
.gitignore
Kconfig