Ingo Molnar 3772b73472 Merge commit 'v2.6.35' into perf/core ... Conflicts: tools/perf/Makefile tools/perf/util/hist.c Merge reason: Resolve the conflicts and update to latest upstream. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2010-08-02 08:31:54 +02:00
..
boards	Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6	2009-12-15 09:01:00 -08:00
boot
configs	avr32: update default configurations for ATNGW100, ATSTK1002 and ATSTK1006	2009-12-14 19:33:37 +01:00
include/asm	Merge commit 'v2.6.35' into perf/core	2010-08-02 08:31:54 +02:00
kernel	Merge branch 'timers-for-linus-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-05-19 17:10:06 -07:00
lib
mach-at32ap	serial: fix rs485 for atmel_serial on avr32	2010-07-26 11:59:31 -07:00
mm	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
oprofile
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6	2009-12-15 09:01:00 -08:00
Kconfig.debug
Makefile	avr32: add support for ATNGW100 mkII board	2009-12-14 19:33:33 +01:00