1
linux/arch/mips
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
..
alchemy MIPS: Alchemy: Timer build fix 2009-05-14 13:50:27 +01:00
basler/excite platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver' 2009-03-24 16:38:25 -07:00
bcm47xx MIPS: WGT634U: Add reset button support 2008-10-15 12:46:51 +01:00
boot
cavium-octeon Merge branch 'linus' into irq/numa 2009-06-01 21:06:21 +02:00
cobalt cpumask: remove references to struct irqaction's mask field. 2009-03-30 22:05:14 +10:30
configs i2c/chips: Move max6875 to drivers/misc/eeprom 2009-06-15 18:01:49 +02:00
dec mips: use bcd2bin/bin2bcd 2008-10-20 08:52:41 -07:00
emma Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask 2009-03-30 18:00:26 -07:00
fw
gt64120/wrppmc
include/asm kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
jazz Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask 2009-03-30 18:00:26 -07:00
kernel mm: consolidate init_mm definition 2009-06-16 19:47:28 -07:00
lasat cpumask: remove references to struct irqaction's mask field. 2009-03-30 22:05:14 +10:30
lemote/lm2e cpumask: remove references to struct irqaction's mask field. 2009-03-30 22:05:14 +10:30
lib MIPS: Outline udelay and fix a few issues. 2009-06-08 16:57:51 +01:00
math-emu MIPS: Switch FPU emulator trap to BREAK instruction. 2008-10-30 14:44:34 +00:00
mipssim
mm MIPS: 64-bit: Fix system lockup. 2009-05-20 18:53:14 +01:00
mti-malta irq: change ->set_affinity() to return status 2009-04-28 12:21:16 +02:00
nxp clocksource: pass clocksource to read() callback 2009-04-21 13:41:47 -07:00
oprofile oprofile: more whitespace fixes 2008-10-15 20:55:51 +02:00
pci MIPS: RC32434: Define io_map_base for PCI controller 2009-01-30 21:32:59 +00:00
pmc-sierra MIPS: MSP71xx: Remove the RAMROOT functions 2009-05-14 13:50:29 +01:00
rb532 Input: add driver for S1 button of rb532 2009-03-09 20:10:12 -07:00
sgi-ip22 MIPS: IP22: Fix hang in power button interrupt handler 2009-05-20 18:53:13 +01:00
sgi-ip27 clocksource: pass clocksource to read() callback 2009-04-21 13:41:47 -07:00
sgi-ip32 MIPS: IP32: Remove unnecessary if not even harmful volatile keywords. 2009-05-22 13:52:06 +01:00
sibyte Merge branch 'irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-06-10 15:25:41 -07:00
sni mips: remove driver_data direct access of struct device 2009-06-15 21:30:27 -07:00
txx9 MIPS: TXx9: Fix possible overflow in clock calculations 2009-05-14 13:50:27 +01:00
vr41xx cpumask: remove references to struct irqaction's mask field. 2009-03-30 22:05:14 +10:30
Kconfig MIPS: Cobalt: PCI bus is always required to obtain the board ID 2009-06-08 16:57:50 +01:00
Kconfig.debug MIPS: Kconfig: Fix the arch-specific header path 2008-12-12 18:12:23 +00:00
Makefile MIPS: IP28: Change to build with -mr10k-cache-barrier=store 2009-05-20 18:53:13 +01:00