Thomas Gleixner 6402c7dc2a Merge branch 'linus' into timers/core ... Reason: Get upstream fixes before adding conflicting code. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>		2013-04-24 20:33:54 +02:00
..
asm	Merge branch 'linus' into timers/core	2013-04-24 20:33:54 +02:00
uapi/asm	Merge remote-tracking branch 'efi/urgent' into x86/urgent	2013-04-19 17:09:03 -07:00