Arnd Bergmann f907ab06bb Merge branch 'next/fixes-non-critical' into next/drivers ...

Conflicts:
	arch/arm/mach-lpc32xx/clock.c
	arch/arm/mach-pxa/pxa25x.c
	arch/arm/mach-pxa/pxa27x.c

The conflicts with pxa are non-obvious, we have multiple branches
adding and removing the same clock settings. According to
Haojian Zhuang, removing the sa1100 rtc dummy clock is the correct
fix here.

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

2012-03-20 22:42:24 +00:00

..

acpi

Merge branches 'atomicio-apei', 'hotplug', 'sony-nvs-nosave' and 'thermal-netlink' into release

2012-01-23 19:47:06 -05:00

asm-generic

[PARISC] fix compile break caused by iomap: make IOPORT/PCI mapping functions conditional

2012-02-27 09:43:30 -06:00

crypto

…

drm

drm/exynos: exynos_drm.h header file fixes

2012-02-15 10:29:12 +09:00

keys

keys: add a "logon" key type

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

linux

Merge branch 'next/fixes-non-critical' into next/drivers

2012-03-20 22:42:24 +00:00

math-emu

…

media

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2012-01-18 12:53:54 -08:00

misc

…

mtd

mtd: document that MEMWRITE ioctl is NAND-specific

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

net

route: Remove redirect_genid

2012-03-08 00:30:32 -08:00

pcmcia

…

rdma

rdma/core: Fix sparse warnings

2012-01-04 09:17:45 -08:00

rxrpc

…

scsi

[SCSI] libfc: Declare local functions static

2012-01-16 12:45:48 +04:00

sound

Merge branch 'fix/asoc' into for-linus

2012-01-31 15:13:14 +01:00

target

target: Change target_submit_cmd() to return void

2012-02-07 06:41:04 +00:00

trace

sched/events: Revert trace_sched_stat_sleeptime()

2012-02-22 12:06:55 +01:00

video

Merge tag 'fbdev-fixes-for-3.3-1' of git://github.com/schandinat/linux-2.6

2012-02-07 15:54:02 -08:00

xen

Merge branch 'for-3.3/drivers' of git://git.kernel.dk/linux-block

2012-01-15 12:48:41 -08:00

Kbuild

…