1
linux/drivers/base
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
..
power PM: Remove device_type suspend()/resume() 2009-06-12 21:32:32 +02:00
attribute_container.c
base.h
bus.c
class.c
core.c Driver Core: add nodename callbacks 2009-06-15 21:30:25 -07:00
cpu.c
dd.c Driver core: fix comment for device_attach() 2009-06-15 21:30:24 -07:00
devres.c
dma-mapping.c
driver.c
firmware_class.c driver core: fix gcc 4.3.3 warnings about string literals 2009-06-15 21:30:25 -07:00
firmware.c
hypervisor.c
init.c
iommu.c
isa.c
Kconfig
Makefile
map.c
memory.c
module.c
node.c mm: remove CONFIG_UNEVICTABLE_LRU config option 2009-06-16 19:47:42 -07:00
platform.c driver core: fix gcc 4.3.3 warnings about string literals 2009-06-15 21:30:25 -07:00
sys.c driver core: fix gcc 4.3.3 warnings about string literals 2009-06-15 21:30:25 -07:00
topology.c
transport_class.c