Arnd Bergmann 366695ff70 Merge branches 'depends/pinctrl/devel' and 'depends/rmk/clkdev' into spear/pinctrl ...

The spear/pinctrl branch has hard dependencies on both the
pinctrl branch and the clkdev branch. We merge those here
to fix it up without having to rebase a branch that has
been pulled into other stable branches already.

Conflicts:
	Documentation/driver-model/devres.txt

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

2012-05-12 20:38:42 +02:00

..

acpi

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2012-03-30 16:45:39 -07:00

asm-generic

asm-generic: add linux/types.h to cmpxchg.h

2012-04-02 14:41:27 -07:00

crypto

crypto: user - Fix lookup of algorithms with IV generator

2012-03-29 19:52:47 +08:00

drm

Merge branch 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung into drm-intel-fixes

2012-04-12 17:42:01 +01:00

keys

keys: add a "logon" key type

2012-01-17 22:39:40 -06:00

linux

Merge branches 'depends/pinctrl/devel' and 'depends/rmk/clkdev' into spear/pinctrl

2012-05-12 20:38:42 +02:00

math-emu

…

media

Merge tag 'device-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2012-03-24 10:41:37 -07:00

misc

…

mtd

mtd: document that MEMWRITE ioctl is NAND-specific

2012-01-09 18:18:36 +00:00

net

mac80211: Convert WARN_ON to WARN_ON_ONCE

2012-04-09 15:54:48 -04:00

pcmcia

…

rdma

Merge branches 'cma', 'cxgb3', 'cxgb4', 'ehca', 'iser', 'mad', 'nes', 'qib', 'srp' and 'srpt' into for-next

2012-03-19 09:50:33 -07:00

rxrpc

…

scsi

SCSI: Fix error handling when no ULD is attached

2012-04-15 11:08:53 -07:00

sound

ALSA: hda - hide HDMI/ELD printks unless snd.debug=2

2012-04-10 14:53:55 +02:00

target

target: Use array_zalloc for device_list

2012-03-15 19:15:51 -07:00

trace

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-04-04 10:04:42 -07:00

video

Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm

2012-03-27 18:17:02 -07:00

xen

Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

2012-04-04 17:13:43 -07:00

Kbuild

…