kevin/linux
1
Fork 0
Code
c29c08b598
linux/arch
History
Linus Torvalds bbbfb910d1 Merge branch 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linux 
* 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linux:
  DMAENGINE: correct PL080 register header file
  ARM: SAMSUNG: Fix on build warning about dependency in Kconfig
  ARM: SMDK6410: Make virtual screen twice depth of real
  ARM: S3C64XX: Update consistent DMA size to 8MiB
  ARM: S3C64XX: Add audio support to SmartQ
  ARM: S3C64XX: Framebuffer fix for SmartQ5
  ARM: S3C64XX: Set wifi and iNAND as permanently connected SD devices on SmartQ boards
  ARM: S3C64XX: Move SmartQ LCD control platform definition to shared file
  ARM: mach-real6410: add sdhc device support
  ARM: mach-real6410: add dm9000 ethernet support for mach-real6410
  ARM: S3C64XX: Support for Real6410

Fix up trivial conflicts in arch/arm/mach-s3c64xx/mach-smartq5.c
("remove pixclock" vs "Framebuffer fix for SmartQ5")
2010-08-14 11:59:44 -07:00
..
alpha Mark arguments to certain syscalls as being const 2010-08-13 16:53:13 -07:00
arm Merge branch 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linux 2010-08-14 11:59:44 -07:00
avr32 Mark arguments to certain syscalls as being const 2010-08-13 16:53:13 -07:00
blackfin Mark arguments to certain syscalls as being const 2010-08-13 16:53:13 -07:00
cris Merge branch 'io_remap_pfn_range' of git://www.jni.nu/cris 2010-08-12 10:17:19 -07:00
frv Mark arguments to certain syscalls as being const 2010-08-13 16:53:13 -07:00
h8300 Mark arguments to certain syscalls as being const 2010-08-13 16:53:13 -07:00
ia64 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 2010-08-13 21:23:57 -07:00
m32r Mark arguments to certain syscalls as being const 2010-08-13 16:53:13 -07:00
m68k Mark arguments to certain syscalls as being const 2010-08-13 16:53:13 -07:00
m68knommu Mark arguments to certain syscalls as being const 2010-08-13 16:53:13 -07:00
microblaze Mark arguments to certain syscalls as being const 2010-08-13 16:53:13 -07:00
mips Mark arguments to certain syscalls as being const 2010-08-13 16:53:13 -07:00
mn10300 Mark arguments to certain syscalls as being const 2010-08-13 16:53:13 -07:00
parisc Mark arguments to certain syscalls as being const 2010-08-13 16:53:13 -07:00
powerpc Mark arguments to certain syscalls as being const 2010-08-13 16:53:13 -07:00
s390 Mark arguments to certain syscalls as being const 2010-08-13 16:53:13 -07:00
score score: fix dereference of NULL pointer in local_flush_tlb_page() 2010-08-12 08:43:29 -07:00
sh Mark arguments to certain syscalls as being const 2010-08-13 16:53:13 -07:00
sparc Mark arguments to certain syscalls as being const 2010-08-13 16:53:13 -07:00
tile dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
um Mark arguments to certain syscalls as being const 2010-08-13 16:53:13 -07:00
x86 Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2010-08-13 18:00:25 -07:00
xtensa Mark arguments to certain syscalls as being const 2010-08-13 16:53:13 -07:00
.gitignore
Kconfig Merge branch 'perf/nmi' into perf/core 2010-08-05 08:45:05 +02:00