diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-12 17:37:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-12 17:37:49 -0400 |
commit | 589bf8d52b5bbb580962438ad9403ec6853bc12b (patch) | |
tree | b11aaf7c0e6dfc207db237381bfc11739dffa809 /drivers/misc/ibmasm/heartbeat.c | |
parent | e3c6f15fecee5aaa2dd1d0b83b17d09b64997e31 (diff) | |
parent | 787b2faadc4356b6c2c71feb42fb944fece9a12f (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: (24 commits)
ARM: force dcache flush if dcache_dirty bit set
[ARM] pxa: workaround errata #37 by not using half turbo switching
[ARM] pxamci: fix printing gpio numbers in pxamci_probe
[ARM] pxa/csb726: adjust duplicate structure field initialization
ARM: Add kmap_atomic type debugging
ARM: boolean bit testing
ARM: update die() output
ARM: Dump code/mem oops lines with the appropriate log level
ARM: Dump memory and backtrace as one printk per line
ARM: 5756/1: ep93xx: introduce clk parent
ARM: 5754/1: ep93xx: update i2c support
ARM: 5753/1: ep93xx: remove old EP93XX_GPIO_* defines
ARM: 5729/1: ep93xx: define EP93XX_*_PHYS_BASE with macros
ARM: 5751/1: ep93xx/micro9: Add Micro9-Slim
ARM: 5750/1: ep93xx/micro9: Update platform code
ARM: 5749/1: ep93xx/micro9: Update maintainer
ARM: 5752/1: SA1100: fix building of h3100
ARM: 5748/1: bcmring: fix build warning messages
ARM: 5747/1: Fix the start_pg value in free_memmap()
ARM: 5746/1: Handle possible translation errors in ARMv6/v7 coherent_user_range
...
Diffstat (limited to 'drivers/misc/ibmasm/heartbeat.c')
0 files changed, 0 insertions, 0 deletions