linux-sg2042/arch
Ingo Molnar f46a680413 Merge branch 'linus' into perf/urgent
Merge reason: Fix upstream breakage introduced by:

 de5d9bf: Move list types from <linux/list.h> to <linux/types.h>.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2010-08-12 21:39:04 +02:00
..
alpha dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
arm Merge branch 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm 2010-08-12 10:07:32 -07:00
avr32 dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
blackfin dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
cris Merge branch 'io_remap_pfn_range' of git://www.jni.nu/cris 2010-08-12 10:17:19 -07:00
frv dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
h8300 Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block 2010-08-10 15:22:42 -07:00
ia64 [IA64] Fix rwsem: RWSEM_WAITING_BIAS must not be unsigned. 2010-08-12 09:14:56 -07:00
m32r Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block 2010-08-10 15:22:42 -07:00
m68k dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
m68knommu time: Kill off CONFIG_GENERIC_TIME 2010-07-27 12:40:54 +02:00
microblaze dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
mips dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
mn10300 MN10300: Use no_printk() for disabled gdbstub debugging functions 2010-08-12 09:51:35 -07:00
parisc parisc: fix wrong page aligned size calculation in ioremapping code 2010-08-12 08:43:29 -07:00
powerpc Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 2010-08-12 09:11:31 -07:00
s390 Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block 2010-08-10 15:22:42 -07:00
score score: fix dereference of NULL pointer in local_flush_tlb_page() 2010-08-12 08:43:29 -07:00
sh Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2010-08-11 09:13:19 -07:00
sparc dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
tile dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
um Merge branch 'params' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus 2010-08-12 10:01:59 -07:00
x86 Merge branch 'linus' into perf/urgent 2010-08-12 21:39:04 +02:00
xtensa dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
.gitignore
Kconfig Merge branch 'perf/nmi' into perf/core 2010-08-05 08:45:05 +02:00