Ingo Molnar a3d06cc6aa Merge branch 'linus' into perfcounters/core
Conflicts:
	arch/x86/include/asm/kmap_types.h
	include/linux/mm.h

	include/asm-generic/kmap_types.h

Merge reason: We crossed changes with kmap_types.h cleanups in mainline.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-06-17 13:06:17 +02:00
..
2009-04-01 08:59:14 -07:00
2008-08-18 21:40:03 +02:00
2008-08-04 13:18:17 +10:00
2009-03-24 11:02:59 +02:00
2009-03-24 11:02:58 +02:00
2008-11-19 16:04:58 +11:00
2009-06-12 16:53:38 +10:00
2009-05-21 15:44:21 +10:00
2008-12-21 14:21:14 +11:00
2009-04-07 15:18:58 +10:00
2008-10-15 11:31:54 +11:00
2008-09-06 19:30:15 +01:00
2009-04-01 08:59:16 -07:00
2008-11-19 16:04:55 +11:00
2009-03-30 22:05:12 +10:30