aha/arch
Linus Torvalds 517d08699b Merge branch 'akpm'
* akpm: (182 commits)
  fbdev: bf54x-lq043fb: use kzalloc over kmalloc/memset
  fbdev: *bfin*: fix __dev{init,exit} markings
  fbdev: *bfin*: drop unnecessary calls to memset
  fbdev: bfin-t350mcqb-fb: drop unused local variables
  fbdev: blackfin has __raw I/O accessors, so use them in fb.h
  fbdev: s1d13xxxfb: add accelerated bitblt functions
  tcx: use standard fields for framebuffer physical address and length
  fbdev: add support for handoff from firmware to hw framebuffers
  intelfb: fix a bug when changing video timing
  fbdev: use framebuffer_release() for freeing fb_info structures
  radeon: P2G2CLK_ALWAYS_ONb tested twice, should 2nd be P2G2CLK_DAC_ALWAYS_ONb?
  s3c-fb: CPUFREQ frequency scaling support
  s3c-fb: fix resource releasing on error during probing
  carminefb: fix possible access beyond end of carmine_modedb[]
  acornfb: remove fb_mmap function
  mb862xxfb: use CONFIG_OF instead of CONFIG_PPC_OF
  mb862xxfb: restrict compliation of platform driver to PPC
  Samsung SoC Framebuffer driver: add Alpha Channel support
  atmel-lcdc: fix pixclock upper bound detection
  offb: use framebuffer_alloc() to allocate fb_info struct
  ...

Manually fix up conflicts due to kmemcheck in mm/slab.c
2009-06-16 19:50:13 -07:00
..
alpha kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
arm Merge branch 'akpm' 2009-06-16 19:50:13 -07:00
avr32 mm: consolidate init_mm definition 2009-06-16 19:47:28 -07:00
blackfin Merge branch 'akpm' 2009-06-16 19:50:13 -07:00
cris kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
frv mm: consolidate init_mm definition 2009-06-16 19:47:28 -07:00
h8300 kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
ia64 kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
m32r kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
m68k kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
m68knommu mm: consolidate init_mm definition 2009-06-16 19:47:28 -07:00
microblaze kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
mips Merge branch 'akpm' 2009-06-16 19:50:13 -07:00
mn10300 kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
parisc kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
powerpc Merge branch 'akpm' 2009-06-16 19:50:13 -07:00
s390 Merge branch 'akpm' 2009-06-16 19:50:13 -07:00
sh kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
sparc Merge branch 'akpm' 2009-06-16 19:50:13 -07:00
um Merge branch 'akpm' 2009-06-16 19:50:13 -07:00
x86 Merge branch 'akpm' 2009-06-16 19:50:13 -07:00
xtensa kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
.gitignore
Kconfig mutex: have non-spinning mutexes on s390 by default 2009-04-09 19:28:24 +02:00