aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-20 13:34:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-20 13:34:17 -0700
commit7c6d87ac843bfbc5a7669736882a0e88c217a820 (patch)
treeb757687fcc7493a322c5c27aa141c87668900234 /kernel
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input (diff)
parentviafb: move some include files to include/linux (diff)
downloadlinux-dev-7c6d87ac843bfbc5a7669736882a0e88c217a820.tar.xz
linux-dev-7c6d87ac843bfbc5a7669736882a0e88c217a820.zip
Merge branch 'viafb-next' of git://git.lwn.net/linux-2.6
* 'viafb-next' of git://git.lwn.net/linux-2.6: (35 commits) viafb: move some include files to include/linux viafb: Eliminate some global.h references viafb: get rid of i2c debug cruft viafb: fold via_io.h into via-core.h viafb: Fix initialization error paths viafb: Do not remove gpiochip under spinlock viafb: make procfs entries optional viafb: fix proc entry removal viafb: improve misc register handling viafb: replace inb/outb viafb: move some modesetting functions to a seperate file viafb: unify modesetting functions viafb: Reserve framebuffer memory for the upcoming camera driver viafb: Add a simple VX855 DMA engine driver viafb: Add a simple interrupt management infrastructure via: Rationalize vt1636 detection viafb: Introduce viafb_find_i2c_adapter() via: Do not attempt I/O on inactive I2C adapters viafb: Turn GPIO and i2c into proper platform devices viafb: Convert GPIO and i2c to the new indexed port ops ...
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions