Merge commit 'v2.6.35-rc6' into devicetree/next
authorGrant Likely <grant.likely@secretlab.ca>
Sat, 24 Jul 2010 15:49:13 +0000 (09:49 -0600)
committerGrant Likely <grant.likely@secretlab.ca>
Sat, 24 Jul 2010 15:49:13 +0000 (09:49 -0600)
commit4e4f62bf7396fca48efe61513640ee399a6046e3
tree42a503af02d9806bcc05e5fcc2cd53f9bd45b0c2
parent9e3288dc9a94fab5ea87db42177d3a9e0345a614
parentb37fa16e78d6f9790462b3181602a26b5af36260
Merge commit 'v2.6.35-rc6' into devicetree/next

Conflicts:
arch/sparc/kernel/prom_64.c
arch/microblaze/Kconfig
arch/powerpc/Kconfig
arch/powerpc/include/asm/irq.h
arch/powerpc/kernel/irq.c
arch/sparc/Kconfig
arch/sparc/kernel/prom_64.c
drivers/i2c/i2c-core.c
drivers/serial/sunsu.c