Linus Torvalds 21ebd6c68b Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 ... * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (59 commits) rtc: max8925: Add function to work as wakeup source mfd: Add pm ops to max8925 mfd: Convert aat2870 to dev_pm_ops mfd: Still check other interrupts if we get a wm831x touchscreen IRQ mfd: Introduce missing kfree in 88pm860x probe routine mfd: Add S5M series configuration mfd: Add s5m series irq driver mfd: Add S5M core driver mfd: Improve mc13xxx dt binding document mfd: Fix stmpe section mismatch mfd: Fix stmpe build warning mfd: Fix STMPE I2c build failure mfd: Constify aat2870-core i2c_device_id table gpio: Add support for stmpe variant 801 mfd: Add support for stmpe variant 801 mfd: Add support for stmpe variant 610 mfd: Add support for STMPE SPI interface mfd: Separate out STMPE controller and interface specific code misc: Remove max8997-muic sysfs attributes mfd: Remove unused wm831x_irq_data_to_mask_reg() ... Fix up trivial conflict in drivers/leds/Kconfig due to addition of LEDS_MAX8997 and LEDS_TCA6507 next to each other.		2012-01-13 20:43:32 -08:00
..
alpha	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci	2012-01-11 18:50:26 -08:00
arm	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6	2012-01-13 20:43:32 -08:00
avr32	treewide: remove useless NORET_TYPE macro and uses	2012-01-12 20:13:03 -08:00
blackfin	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci	2012-01-11 18:50:26 -08:00
c6x	C6X: replace tick_nohz_stop/restart_sched_tick calls	2012-01-08 15:13:16 -05:00
cris	lib: use generic pci_iomap on all architectures	2012-01-10 18:04:27 -08:00
frv	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci	2012-01-11 18:50:26 -08:00
h8300	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci	2012-01-11 18:50:26 -08:00
hexagon	lib: move GENERIC_IOMAP to lib/Kconfig	2011-11-24 22:21:19 +02:00
ia64	Merge branch 'wire-accept4' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux	2012-01-13 20:40:12 -08:00
m32r	Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm	2012-01-08 13:10:57 -08:00
m68k	treewide: convert uses of ATTRIB_NORETURN to __noreturn	2012-01-12 20:13:03 -08:00
microblaze	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci	2012-01-11 18:50:26 -08:00
mips	treewide: convert uses of ATTRIB_NORETURN to __noreturn	2012-01-12 20:13:03 -08:00
mn10300	treewide: convert uses of ATTRIB_NORETURN to __noreturn	2012-01-12 20:13:03 -08:00
openrisc	cpu: Register a generic CPU device on architectures that currently do not	2012-01-11 15:50:11 -08:00
parisc	parisc, exec: remove redundant set_fs(USER_DS)	2012-01-12 20:13:04 -08:00
powerpc	kexec: remove KMSG_DUMP_KEXEC	2012-01-12 20:13:11 -08:00
s390	treewide: convert uses of ATTRIB_NORETURN to __noreturn	2012-01-12 20:13:03 -08:00
score	cpu: Register a generic CPU device on architectures that currently do not	2012-01-11 15:50:11 -08:00
sh	treewide: convert uses of ATTRIB_NORETURN to __noreturn	2012-01-12 20:13:03 -08:00
sparc	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci	2012-01-11 18:50:26 -08:00
tile	treewide: convert uses of ATTRIB_NORETURN to __noreturn	2012-01-12 20:13:03 -08:00
um	cpu: Register a generic CPU device on architectures that currently do not	2012-01-11 15:50:11 -08:00
unicore32	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci	2012-01-11 18:50:26 -08:00
x86	x86/mce: Fix CPU hotplug and suspend regression related to MCE	2012-01-13 19:11:35 -08:00
xtensa	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci	2012-01-11 18:50:26 -08:00
.gitignore
Kconfig	mm,x86,um: move CMPXCHG_DOUBLE config option	2012-01-12 20:13:03 -08:00