Linus Torvalds 0cd43f83d3 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 ... * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: (48 commits) ieee1394: raw1394: arm functions slept in atomic context ieee1394: sbp2: enable auto spin-up for all SBP-2 devices MAINTAINERS: updates to IEEE 1394 subsystem maintainership ieee1394: ohci1394: check for errors in suspend or resume set power state of firewire host during suspend ieee1394: ohci1394: more obvious endianess handling ieee1394: ohci1394: fix endianess bug in debug message ieee1394: sbp2: don't prefer MODE SENSE 10 ieee1394: nodemgr: grab class.subsys.rwsem in nodemgr_resume_ne ieee1394: nodemgr: fix rwsem recursion ieee1394: sbp2: more help in Kconfig ieee1394: sbp2: prevent rare deadlock in shutdown ieee1394: sbp2: update includes ieee1394: sbp2: better handling of transport errors ieee1394: sbp2: recheck node generation in sbp2_update ieee1394: sbp2: safer agent reset in error handlers ieee1394: sbp2: handle "sbp2util_node_write_no_wait failed" CONFIG_PM=n slim: drivers/ieee1394/ohci1394.c ieee1394: safer definition of empty macros video1394: add poll file operation support ...		2006-09-30 09:38:19 -07:00
..
acorn	i2c-algo-bit: Discard the mdelay data struct member	2006-09-26 15:38:51 -07:00
acpi	[PATCH] Really ignore kmem_cache_destroy return value	2006-09-27 08:26:10 -07:00
amba
ata	[libata] Don't use old-EH ->eng_timeout() hook when not needed	2006-09-27 05:41:13 -04:00
atm	[ATM] he: Fix __init/__devinit conflict	2006-09-24 20:09:33 -07:00
base	[PATCH] kthread: drivers/base/firmware_class.c	2006-09-29 09:18:08 -07:00
block	[PATCH] loop: forward-port resource leak checks from Solar	2006-09-29 09:18:22 -07:00
bluetooth	[Bluetooth] Code cleanup for the HCI UART driver	2006-09-28 18:01:30 -07:00
cdrom	[PATCH] cdrom/gdsc: fix printk format warning	2006-08-27 11:01:33 -07:00
char	[PATCH] Fix locking for tty drivers when doing urgent characters	2006-09-29 09:18:24 -07:00
clocksource
connector
cpufreq	[CPUFREQ] Fix some more CPU hotplug locking.	2006-09-22 19:15:23 -04:00
crypto	[CRYPTO] padlock: Convert padlock-sha to use crypto_hash	2006-09-21 11:46:22 +10:00
dio
dma
edac
eisa	[PATCH] EISA bus MODALIAS attributes support	2006-09-27 08:26:19 -07:00
fc4
firmware	[PATCH] DMI: Decode and save OEM String information	2006-09-29 09:18:09 -07:00
hwmon	hwmon: Remove Yuan Mu's address	2006-09-28 15:31:19 -07:00
i2c	[PATCH] i2c-sibyte: Fix modular build breakage	2006-09-29 09:34:17 -07:00
ide	[PATCH] atiixp: ATI SB600 IDE support for various modes	2006-09-29 09:18:12 -07:00
ieee1394	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6	2006-09-30 09:38:19 -07:00
infiniband	Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband	2006-09-29 15:18:22 -07:00
input	[PATCH] OMAP: Add keypad driver	2006-09-29 09:18:07 -07:00
isdn	[IPV4]: annotate struct in_ifaddr	2006-09-28 18:00:55 -07:00
leds	[PATCH] Make net48xx-led use scx200_gpio_ops	2006-09-29 09:18:06 -07:00
macintosh	[PATCH] windfarm_smu_sat.c: simplify around i2c_add_driver()	2006-09-29 09:18:19 -07:00
mca
md	[BLOCK] dm-crypt: trivial comment improvements	2006-09-21 11:46:27 +10:00
media	USB: Dealias -110 code (more complete)	2006-09-27 11:59:00 -07:00
message	[SCSI] scsi_transport_sas: remove local_attached flag	2006-08-27 22:30:11 -05:00
mfd	[PATCH] ucb1x00-ts: handle errors from input_register_device()	2006-09-29 09:18:10 -07:00
misc	[PATCH] inode-diet: Eliminate i_blksize from the inode structure	2006-09-27 08:26:18 -07:00
mmc	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2006-09-28 14:40:39 -07:00
mtd	[MTD] Whitespace cleanup in SSFDC driver.	2006-09-23 16:20:48 +01:00
net	[BNX2]: Disable MSI on 5706 if AMD 8132 bridge is present.	2006-09-29 17:06:23 -07:00
nubus
oprofile	[PATCH] inode-diet: Eliminate i_blksize from the inode structure	2006-09-27 08:26:18 -07:00
parisc
parport	[PATCH] CONFIG_PM=n slim: drivers/parport/parport_serial.c	2006-09-29 09:18:13 -07:00
pci	[PATCH] msi: use kmem_cache_zalloc()	2006-09-27 08:26:19 -07:00
pcmcia
pnp
rapidio
rtc	[PATCH] RTC: more XSTP/VDET support for rtc-rs5c348 driver	2006-09-29 09:18:24 -07:00
s390	[IPV4]: inet_addr_type() annotations	2006-09-28 18:01:07 -07:00
sbus	[OPENPROMIO]: Handle current_node being NULL correctly.	2006-09-18 01:47:13 -07:00
scsi	[PATCH] EISA bus MODALIAS attributes support	2006-09-27 08:26:19 -07:00
serial	[SERIAL] sunzilog: Mark sunzilog_init_hw as __devinit.	2006-09-29 16:12:43 -07:00
sh
sn
spi
tc
telephony
usb	USB: fix build error in ohci driver	2006-09-28 17:06:45 -07:00
video	Merge branch 'intelfb-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/intelfb-2.6	2006-09-30 09:36:56 -07:00
w1
zorro
Kconfig	Move libata to drivers/ata.	2006-08-10 07:31:37 -04:00
Makefile	Move libata to drivers/ata.	2006-08-10 07:31:37 -04:00