Linus Torvalds 71a8638480 Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6 ... * 'viafb-next' of git://github.com/schandinat/linux-2.6: (24 commits) viafb: Automatic OLPC XO-1.5 configuration viafb: remove unused CEA mode viafb: try to map less memory in case of failure viafb: use write combining for video ram viafb: add X server compatibility mode viafb: reduce OLPC refresh a bit viafb: fix OLPC XO 1.5 device connection viafb: fix OLPC DCON refresh rate viafb: delete clock and PLL initialization viafb: replace custom return values viafb: some small cleanup for global variables viafb: gather common good, old VGA initialization in one place viafb: add engine clock support viafb: add VIA slapping capability viafb: split clock and PLL code to an extra file viafb: add primary/secondary clock on/off switches viafb: add clock source selection and PLL power management support viafb: prepare for PLL separation viafb: call viafb_get_clk_value only in viafb_set_vclock viafb: remove unused max_hres/vres ...		2011-05-22 12:39:58 -07:00
..
accessibility
acpi	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6	2011-05-20 13:39:00 -07:00
amba
ata	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev	2011-05-20 14:31:27 -07:00
atm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-05-20 13:43:21 -07:00
auxdisplay
base	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6	2011-05-19 18:24:11 -07:00
bcma	bcma: pci: trivial: correct amount of maximum retries	2011-05-12 14:10:50 -04:00
block	Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block	2011-05-18 06:49:02 -07:00
bluetooth	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem	2011-05-16 19:32:19 -04:00
cdrom	cdrom: always check_disk_change() on open	2011-04-29 10:17:25 +02:00
char	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2011-05-20 17:24:14 -07:00
clk	CLKDEV: Fix clkdev return value for NULL clk case	2011-04-30 10:14:08 +01:00
clocksource	Merge branch 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into timers/clocksource	2011-05-14 12:06:36 +02:00
connector
cpufreq	Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-05-19 17:55:12 -07:00
cpuidle
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2011-05-20 17:24:14 -07:00
dca
dio
dma
edac	drivercore: revert addition of of_match to struct device	2011-05-18 12:32:23 -06:00
eisa
firewire	firewire: sbp2: parallelize login, reconnect, logout	2011-05-10 22:53:46 +02:00
firmware	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6	2011-05-19 18:24:11 -07:00
gpio
gpu	drm: Take lock around probes for drm_fb_helper_hotplug_event	2011-05-16 12:01:43 +10:00
hid
hwmon	hwmon: (twl4030-madc-hwmon) Return proper error if hwmon_device_register fails	2011-05-01 09:06:35 -07:00
hwspinlock
i2c	drivercore: revert addition of of_match to struct device	2011-05-18 12:32:23 -06:00
ide
idle
ieee802154	net: call dev_alloc_name from register_netdevice	2011-05-05 10:57:45 -07:00
infiniband	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-05-20 13:43:21 -07:00
input	input/atari: Fix mouse movement and button mapping	2011-05-19 18:19:12 +02:00
isdn	isdn: capi: Use pr_debug() instead of ifdefs.	2011-05-19 18:20:29 -04:00
leds	drivers/leds/leds-lm3530.c: add MODULE_DEVICE_TABLE	2011-05-18 02:55:22 -07:00
lguest	Correct occurrences of	2011-05-06 09:27:55 -07:00
macintosh	powerpc/pmac: Update via-pmu to new syscore_ops	2011-05-20 15:37:22 +10:00
mca
md
media	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2011-05-21 12:25:07 -07:00
memstick
message	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2011-05-20 13:29:52 -07:00
mfd	mfd: Fix for the TWL4030 PM sleep/wakeup sequence	2011-05-11 11:09:58 +02:00
misc	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2011-05-20 13:28:01 -07:00
mmc	drivercore: revert addition of of_match to struct device	2011-05-18 12:32:23 -06:00
mtd	MIPS: Alchemy: Clean up GPIO registers and accessors	2011-05-19 09:55:46 +01:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-05-20 13:43:21 -07:00
nfc
nubus
of
oprofile
parisc
parport
pci	Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-05-19 17:28:58 -07:00
pcmcia	Revert wrong fixes for common misspellings	2011-04-26 23:31:11 -07:00
platform	eeepc-laptop: Use ACPI handle to identify rfkill port	2011-05-09 10:48:47 -04:00
pnp
power
pps
ps3
rapidio	rapidio: fix default routing initialization	2011-05-18 02:55:22 -07:00
regulator
rtc	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-05-19 17:45:08 -07:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-05-20 13:43:21 -07:00
sbus
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-05-20 13:43:21 -07:00
sfi
sh
sn
spi
ssb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-05-20 13:43:21 -07:00
staging	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-05-20 13:43:21 -07:00
target	[SCSI] tcm_fc: Adding FC_FC4 provider (tcm_fc) for FCoE target (TCM - target core) support	2011-05-17 10:52:46 +04:00
tc
telephony
thermal
tty	SERIAL: Lantiq: Add driver for MIPS Lantiq SOCs.	2011-05-19 09:55:43 +01:00
uio
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2011-05-20 13:29:52 -07:00
uwb
vhost	Correct occurrences of	2011-05-06 09:27:55 -07:00
video	Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6	2011-05-22 12:39:58 -07:00
virtio
vlynq
w1
watchdog	MIPS: Alchemy: Clean up GPIO registers and accessors	2011-05-19 09:55:46 +01:00
xen	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6	2011-05-19 16:46:07 -07:00
zorro
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-05-20 13:43:21 -07:00
Makefile	bcma: add Broadcom specific AMBA bus driver	2011-05-10 15:54:54 -04:00