Axel Lin 0e4510f7c9 platform-driver-x86: fix wrong merge for compal-laptop.c ... I found the commit 80183a4b "compal-laptop/fujitsu-laptop/msi-laptop: make dmi_check_cb to return 1 instead of 0" has wrong patch merge. The original patch change the return value for dmi_check_cb(): https://lkml.org/lkml/2010/7/2/88 But commit 80183a4b changed the return value for set_backlight_level. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>		2011-03-28 06:46:03 -04:00
..
accessibility
acpi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2011-03-25 21:01:43 -07:00
amba
ata
atm
auxdisplay
base	Introduce ARCH_NO_SYSDEV_OPS config option (v2)	2011-03-23 22:16:41 +01:00
block	Merge branch 'for-2.6.39/drivers' of git://git.kernel.dk/linux-2.6-block	2011-03-27 20:02:07 -07:00
bluetooth
cdrom
char	drivers/char/mem.c: clean up the code	2011-03-23 19:46:40 -07:00
clk
clocksource
connector
cpufreq	cpufreq: Use syscore_ops for boot CPU suspend/resume (v2)	2011-03-23 22:16:32 +01:00
cpuidle
crypto
dca
dio
dma
edac
eisa
firewire
firmware
gpio	Merge branch 'irq-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-03-25 20:24:05 -07:00
gpu	Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2011-03-24 17:27:20 -07:00
hid
hwmon	Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging	2011-03-27 20:03:39 -07:00
hwspinlock
i2c
ide	ide: ensure that we re-run the queue handler	2011-03-26 19:49:54 +01:00
idle
ieee802154
infiniband	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2011-03-25 21:06:37 -07:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-03-25 20:50:12 -07:00
isdn
leds	Merge git://git.infradead.org/battery-2.6	2011-03-25 21:00:29 -07:00
lguest
macintosh
mca
md	Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm	2011-03-25 20:51:44 -07:00
media	[media] rc: update for bitop name changes	2011-03-24 18:58:55 -07:00
memstick	memstick: add driver for Ricoh R5C592 card reader	2011-03-25 17:45:16 -07:00
message	Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block	2011-03-24 10:16:26 -07:00
mfd	mfd: Clean up max8997 IRQ namespace	2011-03-27 00:09:53 +01:00
misc	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb	2011-03-25 21:04:56 -07:00
mmc	Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block	2011-03-24 10:16:26 -07:00
mtd	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus-1	2011-03-25 17:41:20 +02:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2011-03-25 21:02:22 -07:00
nfc
nubus
of	of/flattree: minor cleanups	2011-03-23 14:55:56 -06:00
oprofile
parisc
parport
pci	Merge branch 'syscore' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6	2011-03-25 21:07:59 -07:00
pcmcia
platform	platform-driver-x86: fix wrong merge for compal-laptop.c	2011-03-28 06:46:03 -04:00
pnp
power	Merge git://git.infradead.org/battery-2.6	2011-03-25 21:00:29 -07:00
pps
ps3
rapidio	rapidio: fix potential null deref on failure path	2011-03-23 19:46:44 -07:00
regulator	regulator: Add MODULE_DEVICE_TABLE to max8997 and max8998	2011-03-27 11:47:25 +01:00
rtc
s390	Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6	2011-03-25 17:47:04 -07:00
sbus
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2011-03-25 21:06:13 -07:00
sfi
sh	sh: Use struct syscore_ops instead of sysdevs	2011-03-23 18:57:37 +09:00
sn
spi	Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6	2011-03-24 09:30:20 -07:00
ssb
staging	staging: Fix bdops->check_events() misconversion in cyasblkdev_block.c	2011-03-26 19:52:59 +01:00
target	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2011-03-25 21:06:13 -07:00
tc
telephony
thermal
tty	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb	2011-03-25 21:04:56 -07:00
uio
usb	Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2011-03-24 10:02:55 -07:00
uwb
vhost
video	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2011-03-24 09:50:13 -07:00
virtio
vlynq
w1	w1: Silence ds1wm warnings related to mfd_get_cell changes	2011-03-23 10:42:02 +01:00
watchdog	rdc321x-southbridge: Use mfd_data instead of driver_data	2011-03-23 10:41:57 +01:00
xen
zorro
Kconfig
Makefile