Linus Torvalds abab012a52 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev ... * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (29 commits) ahci: add another PCI ID for marvell libata: Use 'bool' return value for ata_id_XXX sata_fsl: Update RX_WATER_MARK for TRANSCFG sata_fsl: Fix wrong Device Error Register usage libata: Include WWN ID in inquiry VPD emulation ata/pata_arasan_cf: fill dma chan->private from pdata->dma_priv ata: pata: Convert pr_*(DRV_NAME ...) to pr_fmt/pr_<level> pata_arasan_cf: fix printk format string warning pata_arasan_cf: Adding support for arasan compact flash host controller libata-sff: add ata_sff_queue_work() & ata_sff_queue_delayed_work() ahci: AHCI mode SATA patch for Intel Patsburg SATA RAID controller ahci: recognize Marvell 88se9125 PCIe SATA 6.0 Gb/s controller libata: remove ATA_FLAG_LPM libata: remove ATA_FLAG_NO_LEGACY libata: remove ATA_FLAG_MMIO libata: remove ATA_FLAG_{SRST|SATA_RESET} ipr/sas_ata: use mode mask macros from <linux/ata.h> sata_dwc_460ex: add debugging options sata_dwc_460ex: fix misuse of ata_get_cmd_descript() sata_dwc_460ex: fix return value of dma_dwc_xfer_setup() ...		2011-03-16 08:57:32 -07:00
..
accessibility
acpi	Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-03-16 08:20:19 -07:00
amba
ata	ahci: add another PCI ID for marvell	2011-03-15 02:44:17 -04:00
atm
auxdisplay
base
block	Merge branch 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm	2011-03-15 10:59:09 -07:00
bluetooth	Revert "Bluetooth: Enable USB autosuspend by default on btusb"	2011-02-23 19:42:03 -08:00
cdrom
char	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-03-15 18:53:35 -07:00
clk
clocksource
connector
cpufreq	Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-03-16 08:20:19 -07:00
cpuidle
crypto
dca
dio
dma
edac
eisa
firewire
firmware
gpio	gpio: add MODULE_DEVICE_TABLE	2011-03-13 15:35:59 -07:00
gpu	drm/radeon: fix problem with changing active VRAM size. (v2)	2011-03-14 12:51:04 +10:00
hid
hwmon	hwmon/f71882fg: Set platform drvdata to NULL later	2011-03-13 07:42:52 -07:00
i2c	Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-03-15 20:01:36 -07:00
ide
idle
ieee802154
infiniband
input	Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-03-16 08:20:19 -07:00
isdn	drivers:isdn:istream.c Fix typo pice to piece	2011-02-28 12:07:32 -08:00
leds
lguest
macintosh
mca
md	Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-03-16 08:20:19 -07:00
media	Merge branch 'media_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2011-03-10 13:22:10 -08:00
memstick
message	Merge branch 'master' into for-2.6.39	2011-02-21 09:43:56 +01:00
mfd	mfd: Avoid tps6586x burst writes	2011-03-02 10:57:50 +01:00
misc	Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-03-16 08:20:19 -07:00
mmc	Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-03-15 20:01:36 -07:00
mtd	Merge git://git.infradead.org/users/dwmw2/mtd-2.6.38	2011-03-13 15:56:22 -07:00
net	Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-03-16 08:20:19 -07:00
nfc	drivers/nfc/pn544.c: add missing regulator	2011-02-25 15:07:36 -08:00
nubus
of	Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-03-15 20:01:36 -07:00
oprofile
parisc
parport
pci
pcmcia	Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-07 20:45:42 -08:00
platform	dell-laptop: Toggle the unsupported hardware killswitch	2011-02-21 17:06:21 -05:00
pnp
power
pps	pps: make pps_gen_parport depend on BROKEN	2011-03-04 17:53:38 -08:00
ps3
rapidio	rapidio: fix sysfs config attribute to access 16MB of maint space	2011-02-25 15:07:37 -08:00
regulator	regulator, mc13xxx: Remove pointless test for unsigned less than zero	2011-02-25 08:51:07 +00:00
rtc	Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-03-15 20:01:36 -07:00
s390	[S390] tape: deadlock on system work queue	2011-03-03 17:56:14 +01:00
sbus
scsi	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev	2011-03-16 08:57:32 -07:00
sfi
sh
sn
spi	Merge branch 'linus' into x86/platform	2011-02-23 09:21:41 +01:00
ssb
staging
target	[SCSI] target: Fix t_transport_aborted handling in LUN_RESET + active I/O shutdown	2011-02-28 11:23:32 -06:00
tc
telephony
thermal	ACPI: Fix build for CONFIG_NET unset	2011-02-28 18:00:31 -08:00
tty	fmvj18x_cs: add new id	2011-02-28 12:06:20 -08:00
uio
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2011-03-03 15:43:15 -08:00
uwb
vhost
video	drivers/video/backlight/ltv350qv.c: fix a memory leak	2011-03-04 17:53:38 -08:00
virtio
vlynq
w1
watchdog	watchdog: hpwdt: eliminate section mismatch warning	2011-03-14 10:44:31 +00:00
xen	Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-03-15 19:23:40 -07:00
zorro
Kconfig
Makefile