Linus Torvalds 7c6d87ac84 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 ...		2010-05-20 13:34:17 -07:00
..
accessibility
acpi	Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2010-05-20 09:45:38 -07:00
amba
ata	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev	2010-05-20 09:27:37 -07:00
atm
auxdisplay
base	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6	2010-05-20 09:03:55 -07:00
block	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
bluetooth
cdrom
char	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2010-05-20 10:33:06 -07:00
clocksource	Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-05-19 17:10:57 -07:00
connector
cpufreq
cpuidle
crypto
dca
dio
dma	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2010-05-19 11:36:03 -07:00
edac
eisa
firewire	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
firmware
gpio	Merge branch 'topic/asoc' into for-linus	2010-05-20 12:00:43 +02:00
gpu	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
hid
hwmon
i2c	Merge branch 'for-linus/i2c-2635' of git://git.fluff.org/bjdooks/linux	2010-05-20 09:41:17 -07:00
ide
idle
ieee1394
ieee802154
infiniband	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2010-05-20 10:33:06 -07:00
isdn	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
leds
lguest
macintosh
mca
md
media	Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2010-05-20 09:37:45 -07:00
memstick
message
mfd	Merge branch 'topic/asoc' into for-linus	2010-05-20 12:00:43 +02:00
misc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
mmc	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2010-05-19 11:37:22 -07:00
mtd
net	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
nubus
of
oprofile
parisc
parport
pci	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
pcmcia	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2010-05-20 09:09:46 -07:00
platform
pnp
power
pps
ps3
rapidio
regulator	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
rtc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
s390	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
sbus
scsi	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev	2010-05-20 09:27:37 -07:00
serial	Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6	2010-05-20 09:09:46 -07:00
sfi
sh
sn
spi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
ssb
staging	Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2010-05-20 09:37:45 -07:00
tc
telephony
thermal
uio
usb	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-05-20 09:20:59 -07:00
uwb
vhost
video	Merge branch 'viafb-next' of git://git.lwn.net/linux-2.6	2010-05-20 13:34:17 -07:00
virtio
vlynq
w1
watchdog
xen
zorro
Kconfig
Makefile