Olof Johansson 6604269dd2 Merge branch 'clksrc/cleanup' into next/multiplatform ... Merge in the clksrc/cleanup branch to avoid a silly merge conflict. For some reason two versions of the same patch were merged in two branches. Resolve this here to avoid merge conflicts down the road, since it can be confusing to tell which version is the one to keep. * clksrc/cleanup: clocksource: make CLOCKSOURCE_OF_DECLARE type safe Signed-off-by: Olof Johansson <olof@lixom.net> Conflicts: include/linux/clocksource.h		2013-04-28 15:15:05 -07:00
..
acpi	Fixes:	2013-03-12 20:25:53 -07:00
asm-generic	asm-generic: move cmpxchg*_local defs to cmpxchg.h	2013-03-13 06:11:05 +01:00
clocksource	ImgTec Meta architecture changes for v3.9-rc1	2013-03-03 12:06:09 -08:00
crypto
drm	drm/radeon: add Richland pci ids	2013-03-15 18:47:19 -04:00
keys
linux	Merge branch 'clksrc/cleanup' into next/multiplatform	2013-04-28 15:15:05 -07:00
math-emu
media
memory
misc
net	ipv4: Fix ip-header identification for gso packets.	2013-03-26 13:50:05 -04:00
pcmcia
ras
rdma
rxrpc
scsi	SCSI for-linus on 20130301	2013-03-02 11:42:16 -08:00
sound	arm-soc: late OMAP changes	2013-02-28 20:00:40 -08:00
target	target: Rename spc_get_write_same_sectors -> sbc_get_write_same_sectors	2013-02-23 12:46:14 -08:00
trace	Various bug fixes for ext4. The most important is a fix for the new	2013-03-02 19:33:21 -08:00
uapi	net: fix *_DIAG_MAX constants	2013-03-21 12:36:33 -04:00
video	ARM: at91: fix LCD-wiring mode	2013-03-13 11:05:04 +01:00
xen	for-linus-20130331	2013-03-31 11:38:59 -07:00
Kbuild