diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 16:06:49 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 16:06:49 -0700 |
commit | 0d876c6a96e2cabf8632e8066b617d9c2dec9518 (patch) | |
tree | 2be0d37f97a367192f309f61de8bb8dec0a4e55f /drivers/video/sgivwfb.c | |
parent | 900bca34940ca1db8dd04a2e9b240ffac32da6f6 (diff) | |
parent | 6ffab0efc17f70f44810ae50fc40f934c8173f35 (diff) | |
download | linux-0d876c6a96e2cabf8632e8066b617d9c2dec9518.tar.bz2 |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] pxa: corgi backlight driver should not select ssp drivers
[ARM] 5321/1: Kirkwood: fix typo in Makefile
[ARM] 5320/1: fix assembly constraints in implementation of do_div()
[ARM] 5318/1: Swap the PRRR and NMRR values in proc-v7.S
[ARM] 5316/1: AT91: oops (regression) fix on gpio irq
[ARM] msm: vreg interface to msm7k pmic
[ARM] msm: dma: various basic dma improvements and bugfixes
[ARM] msm: clock: provide clk_*() api support for
[ARM] msm: clean up iomap and devices
[ARM] msm: add proc_comm support, necessary for clock and power control
[ARM] msm: rename ARCH_MSM7X00A to ARCH_MSM
[ARM] pxa/spitz: fix unbalance parenthesis in header file spitz.h
[ARM] pxa: update {corgi,spitz}_defconfig to favor SPI-based drivers
[ARM] pxa: fix the corgi_ssp.c dependency issue in {corgi,spitz}_defconfig
Revert "[ARM] pxa/corgi: remove now unused corgi_ssp.c and corgi_lcd.c"
Diffstat (limited to 'drivers/video/sgivwfb.c')
0 files changed, 0 insertions, 0 deletions