diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 12:48:45 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 12:48:45 -0700 |
commit | 26cf445721763d61b08ce394f8bdbd4c5610b563 (patch) | |
tree | a26099dd232b5d0071604787a9eb27b37602645f /drivers/gpu/drm/nouveau/nv50_pm.c | |
parent | 8b9686ff4ddfdf45662024edd567920e6db87beb (diff) | |
parent | 99b662e511e08230e8422e77cbe4fd31ed173df6 (diff) |
Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: select ARCH_NO_SYSDEV_OPS.
sh: fix build error in board-sh7757lcr.c
sh: landisk: Remove whitespace
sh: landisk: Remove mv_nr_irqs
sh: sh-sci: Fix double initialization by serial_console_setup
serial: sh-sci: prevent setup of uninitialized serial console
dma: shdma: add checking the DMAOR_AE in sh_dmae_err
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_pm.c')
0 files changed, 0 insertions, 0 deletions