mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-06-09 04:30:33 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
b33704dffa36f3ed972602ea9ef8b46d3d5e3b06
linux/drivers
History
Peter Huewe b33704dffa staging/xgifb: Include sis headers 
This patch includes the headers of the sis driver and reorders some
includes.

Since the xgi driver used to redefine a lot of stuff from the sis
driver, we can simply include the headers of the sis driver itself, so
we can remove duplicated stuff later on.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-02-09 09:21:56 -08:00
..
accessibility
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
acpi
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-01-18 15:51:48 -08:00
amba
Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2012-01-08 13:10:57 -08:00
ata
[libata] ata_piix: Add Toshiba Satellite Pro A120 to the quirks list
2012-01-17 20:50:53 -05:00
atm
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
auxdisplay
…
base
Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2012-01-16 15:02:30 -08:00
bcma
bcma: connect the bcma bus suspend/resume to the bcma driver suspend/resume
2012-01-17 09:54:08 -05:00
block
nvme: fix merge error due to change of 'make_request_fn' fn type
2012-01-18 15:41:27 -08:00
bluetooth
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
cdrom
block: add and use scsi_blk_cmd_ioctl
2012-01-14 15:07:24 -08:00
char
tpm: fix (ACPI S3) suspend regression
2012-01-18 15:50:17 -08:00
clk
clk: add config option HAVE_CLK_PREPARE into Kconfig
2011-12-28 21:35:06 +08:00
clocksource
Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
2012-01-06 18:15:25 -08:00
connector
…
cpufreq
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
2012-01-11 18:53:33 -08:00
cpuidle
cpu: convert 'cpu' and 'machinecheck' sysdev_class to a regular subsystem
2011-12-21 14:29:42 -08:00
crypto
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2012-01-10 22:01:27 -08:00
dca
…
devfreq
Merge branch 'devfreq-for-next' of git://git.infradead.org/users/kmpark/linux-samsung into pm-devfreq
2011-12-21 09:51:23 +01:00
dio
…
dma
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-01-17 18:40:24 -08:00
edac
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
eisa
…
firewire
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
firmware
Merge commit '070680218379e15c1901f4bf21b98e3cbf12b527' into stable/for-linus-fixes-3.3
2012-01-12 11:53:55 -05:00
gpio
gpio: tps65910: Use correct offset for gpio initialization
2012-01-18 13:48:43 -07:00
gpu
nouveau: Support Optimus models for vga_switcheroo
2012-01-13 09:09:15 +00:00
hid
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
hv
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
2012-01-09 12:09:47 -08:00
hwmon
hwmon: (adm1031) Fix coding style issues
2012-01-16 22:51:48 +01:00
hwspinlock
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-08 18:34:16 -08:00
i2c
Merge branches 'for-33/i2c/eg20t' and 'for-33/i2c/omap' into for-linus/i2c-33
2012-01-17 23:30:41 +00:00
ide
block: add and use scsi_blk_cmd_ioctl
2012-01-14 15:07:24 -08:00
idle
Merge branches 'einj', 'intel_idle', 'misc', 'srat' and 'turbostat-ivb' into release
2012-01-18 01:15:54 -05:00
ieee802154
net: remove NETIF_F_NO_CSUM feature bit
2011-11-16 17:43:12 -05:00
infiniband
Merge branch 'for-next-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2012-01-18 16:29:42 -08:00
input
Merge tag 'for-linus' of git://github.com/rustyrussell/linux
2012-01-14 12:32:16 -08:00
iommu
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
2012-01-10 11:08:21 -08:00
isdn
Merge tag 'for-linus' of git://github.com/rustyrussell/linux
2012-01-14 12:32:16 -08:00
leds
Merge tag 'for-linus' of git://github.com/rustyrussell/linux
2012-01-14 12:32:16 -08:00
lguest
lguest: Make sure interrupt is allocated ok by lguest_setup_irq
2012-01-12 15:44:47 +10:30
macintosh
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
mca
…
md
Merge branch 'for-3.3/core' of git://git.kernel.dk/linux-block
2012-01-15 12:24:45 -08:00
media
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-01-18 12:53:54 -08:00
memstick
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
message
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2012-01-10 10:36:08 -08:00
mfd
Merge tag 'for-linus' of git://github.com/rustyrussell/linux
2012-01-14 12:32:16 -08:00
misc
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-01-17 18:40:24 -08:00
mmc
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-01-17 18:40:24 -08:00
mtd
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-01-17 18:40:24 -08:00
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-01-17 22:26:41 -08:00
nfc
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2012-01-07 12:03:30 -08:00
nubus
…
of
Merge tags 'devicetree-for-linus' and 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6
2012-01-14 13:25:55 -08:00
oprofile
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-01-06 08:02:58 -08:00
parisc
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
parport
Merge tag 'for-linus' of git://github.com/rustyrussell/linux
2012-01-14 12:32:16 -08:00
pci
Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security
2012-01-14 18:36:33 -08:00
pcmcia
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-01-14 13:05:21 -08:00
pinctrl
pinctrl: remove unnecessary max pin number
2012-01-03 09:10:09 +01:00
platform
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
pnp
PNP: work around Dell 1536/1546 BIOS MMCONFIG bug that breaks USB
2012-01-06 12:11:20 -08:00
power
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
pps
…
ps3
…
ptp
ptp: Fix clock_getres() implementation
2011-12-06 11:38:32 +01:00
rapidio
rapidio/tsi721: modify PCIe capability settings
2011-12-09 07:50:29 -08:00
regulator
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
2012-01-13 20:43:32 -08:00
rtc
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
2012-01-13 20:43:32 -08:00
s390
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
sbus
sbus: convert drivers/sbus/char/* to use module_platform_driver()
2011-12-04 10:46:58 -08:00
scsi
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2012-01-18 12:35:17 -08:00
sfi
…
sh
Merge tag 'rmobile-for-linus' of git://github.com/pmundt/linux-sh
2012-01-11 23:29:20 -08:00
sn
…
spi
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-01-17 18:40:24 -08:00
ssb
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
2011-12-14 14:35:41 -05:00
staging
staging/xgifb: Include sis headers
2012-02-09 09:21:56 -08:00
target
target: Set additional sense length field in sense data
2011-12-16 06:29:04 +00:00
tc
…
thermal
…
tty
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-01-17 18:40:24 -08:00
uio
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
usb
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-01-17 18:40:24 -08:00
uwb
Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
2012-01-09 12:09:47 -08:00
vhost
vhost-net: add module alias (v2.1)
2012-01-13 10:12:23 -08:00
video
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-01-17 18:40:24 -08:00
virt
…
virtio
virtio: balloon: Add freeze, restore handlers to support S4
2012-01-12 15:44:47 +10:30
vlynq
…
w1
w1: add fast search for single slave bus
2011-12-09 19:19:18 -08:00
watchdog
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
xen
xen: using EXPORT_SYMBOL requires including export.h
2012-01-18 15:37:49 -08:00
zorro
misc latin1 to utf8 conversions
2012-01-02 13:04:55 +01:00
Kconfig
telephony: Move to staging
2012-02-08 16:58:04 -08:00
Makefile
staging: fix the build breakage cuased by telephony drivers
2012-02-09 09:07:46 -08:00