Arnd Bergmann 511f1cb6d4 Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into next/drivers ... The pxa regulator branch removes the bq24022 driver, while a lot of other regulator drivers got added in the regulator tree. This resolves the trivial conflicts by merging in the regulator patches that are already merged into v3.4. Conflicts: drivers/regulator/Kconfig drivers/regulator/Makefile Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-03-24 11:29:58 +00:00
..
alpha	alpha: fix 32/64-bit bug in futex support	2012-03-05 15:49:43 -08:00
arm	Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into next/drivers	2012-03-24 11:29:58 +00:00
avr32	Merge branch 'lpc32xx/drivers' into next/drivers	2012-02-22 14:20:18 +00: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	Merge branch 'next/fixes-non-critical' into next/drivers	2012-03-20 22:42:24 +00:00
cris	lib: use generic pci_iomap on all architectures	2012-01-10 18:04:27 -08:00
frv	Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers	2012-01-14 18:03:30 -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
ia64	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-01-18 15:51:48 -08:00
m32r	Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers	2012-01-14 18:03:30 -08:00
m68k	m68k: Do not set global share for non-kernel shared pages	2012-02-07 11:25:57 +10:00
microblaze	irq_domain/microblaze: Convert microblaze to use irq_domains	2012-02-16 06:11:24 -07:00
mips	Merge branch 'next/fixes-non-critical' into next/drivers	2012-03-20 22:42:24 +00:00
mn10300	Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers	2012-01-14 18:03:30 -08:00
openrisc	Merge branch 'regulator' of git://github.com/hzhuang1/linux into next/drivers	2012-03-08 09:33:44 -08:00
parisc	[PARISC] don't unconditionally override CROSS_COMPILE for 64 bit.	2012-02-28 09:39:28 -06:00
powerpc	Merge branch 'depends/irqdomain' into next/drivers	2012-03-05 16:58:11 +00:00
s390	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2012-03-01 18:22:55 -08:00
score	score: fix off-by-one index into syscall table	2012-01-23 08:38:49 -08:00
sh	SuperH fixes for 3.3-rc5	2012-02-24 08:56:51 -08:00
sparc	irq_domain: Centralize definition of irq_dispose_mapping()	2012-02-26 16:48:06 -07:00
tile	Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers	2012-01-14 18:03:30 -08:00
um	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit	2012-01-17 16:41:31 -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	Merge branch 'next/fixes-non-critical' into next/drivers	2012-03-20 22:42:24 +00:00
xtensa	xtensa: fix memscan()	2012-02-03 16:16:40 -08:00
.gitignore
Kconfig	mm,x86,um: move CMPXCHG_DOUBLE config option	2012-01-12 20:13:03 -08:00