android_kernel_motorola_sm6225/arch/powerpc/platforms
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
..
8xx powerpc/cpm: Remove some cruft code and defines 2009-05-19 00:47:19 -05:00
40x Merge commit 'jwb/next' into next 2009-06-12 10:35:52 +10:00
44x powerpc/virtex: Add Xilinx ML510 reference design support 2009-06-06 10:15:24 -06:00
52xx powerpc/pci: Clean up direct access to sysdata by 52xx platforms 2009-05-21 15:44:22 +10:00
82xx Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2009-06-15 09:40:05 -07:00
83xx powerpc/fsl_soc: isolate legacy fsl_spi support to mpc832x_rdb boards 2009-04-01 08:59:23 -07:00
85xx powerpc/85xx: Add P2020DS board support 2009-05-19 00:50:43 -05:00
86xx powerpc/86xx: clean up smp init code 2009-05-19 00:50:20 -05:00
512x powerpc/kconfig: Kill PPC_MULTIPLATFORM 2009-03-11 17:11:35 +11:00
amigaone powerpc/kconfig: Kill PPC_MULTIPLATFORM 2009-03-11 17:11:35 +11:00
cell Merge branch 'akpm' 2009-06-16 19:50:13 -07:00
chrp powerpc/pci: Clean up direct access to sysdata by CHRP platforms 2009-05-21 15:44:23 +10:00
embedded6xx Merge commit 'origin/master' into next 2009-03-24 13:38:30 +11:00
iseries powerpc/iseries: Mark signal_vsp_instruction() as maybe unused 2009-06-15 13:27:37 +10:00
maple powerpc/maple: Add a quirk to disable MSI for IPR on Bimini 2009-05-22 16:01:11 +10:00
pasemi Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-05-18 21:08:20 -07:00
powermac powerpc/pci: Clean up direct access to sysdata by powermac platforms 2009-05-21 15:44:23 +10:00
prep powerpc/kconfig: Kill PPC_MULTIPLATFORM 2009-03-11 17:11:35 +11:00
ps3 ps3: Replace direct file operations by callback 2009-06-15 16:47:26 +10:00
pseries Merge commit 'origin/master' into next 2009-06-12 16:53:38 +10:00
fsl_uli1575.c powerpc/85xx: Add P2020DS board support 2009-05-19 00:50:43 -05:00
Kconfig powerpc/virtex: Add support for Xilinx PCI host bridge 2009-06-06 10:14:22 -06:00
Kconfig.cputype Merge commit 'origin/master' into next 2009-06-12 16:53:38 +10:00
Makefile powerpc/amigaone: Add platform support for AmigaOne 2009-02-11 16:00:08 +11:00