kevin/linux
1
Fork 0
Code
aca361c1a0
linux/drivers
History
Linus Torvalds aca361c1a0 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (45 commits)
  [PATCH] Restore channel setting after scan.
  [PATCH] hostap: Fix memory leak on PCI probe error path
  [PATCH] hostap: Remove dead code (duplicated idx != 0)
  [PATCH] hostap: Fix unlikely read overrun in CIS parsing
  [PATCH] hostap: Fix double free in prism2_config() error path
  [PATCH] hostap: Fix ap_add_sta() return value verification
  [PATCH] hostap: Fix hw reset after CMDCODE_ACCESS_WRITE timeout
  [PATCH] wireless/airo: cache wireless scans
  [PATCH] wireless/airo: define default MTU
  [PATCH] wireless/airo: clean up printk usage to print device name
  [PATCH] WE-20 for kernel 2.6.16
  [PATCH] softmac: remove function_enter()
  [PATCH] skge: version 1.5
  [PATCH] skge: compute available ring buffers
  [PATCH] skge: dont free skb until multi-part transmit complete
  [PATCH] skge: multicast statistics fix
  [PATCH] skge: rx_reuse called twice
  [PATCH] skge: dont use dev_alloc_skb for rx buffs
  [PATCH] skge: align receive buffers
  [PATCH] sky2: dont need to use dev_kfree_skb_any
  ...
2006-03-23 16:25:49 -08:00
..
acorn
acpi [PATCH] acpi: remove dock event handling from ibm_acpi 2006-03-23 14:35:15 -08:00
amba
atm [ATM] suni: cast arg properly in SONET_SETFRAMING 2006-03-20 22:35:16 -08:00
base [PATCH] swsusp: add check for suspension of X-controlled devices 2006-03-23 07:38:08 -08:00
block [PATCH] Block queue IO tracing support (blktrace) as of 2006-03-23 2006-03-23 20:00:26 +01:00
bluetooth
cdrom [PATCH] kill cdrom ->dev_ioctl method 2006-03-23 07:38:09 -08:00
char [PATCH] kill _INLINE_ 2006-03-23 07:38:16 -08:00
connector [PATCH] sem2mutex: drivers: raw, connector, dcdbas, ppp_generic 2006-03-23 07:38:10 -08:00
cpufreq
crypto [CRYPTO] api: Align tfm context as wide as possible 2006-03-21 20:14:08 +11:00
dio
edac
eisa
fc4
firmware [PATCH] sem2mutex: drivers: raw, connector, dcdbas, ppp_generic 2006-03-23 07:38:10 -08:00
hwmon [PATCH] hwmon: add required idr locking 2006-03-23 14:21:55 -08:00
i2c [PATCH] I2C: i2c-ixp4xx: Add hwmon class 2006-03-23 14:21:55 -08:00
ide [PATCH] sem2mutex: drivers/ide 2006-03-23 07:38:14 -08:00
ieee1394
infiniband Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2006-03-21 09:31:48 -08:00
input
isdn [PATCH] kill _INLINE_ 2006-03-23 07:38:16 -08:00
macintosh [PATCH] macintosh: tidy-up driver_register() return values 2006-03-23 14:41:04 +11:00
mca
md [PATCH] Block queue IO tracing support (blktrace) as of 2006-03-23 2006-03-23 20:00:26 +01:00
media Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb 2006-03-23 16:23:20 -08:00
message [SCSI] convert mptsas over to end_device/expander allocations 2006-03-19 10:20:45 -06:00
mfd
misc
mmc [PATCH] handle errors returned by platform_get_irq*() 2006-03-20 13:42:57 -08:00
mtd
net Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 2006-03-23 16:25:49 -08:00
nubus
oprofile [PATCH] more for_each_cpu() conversions 2006-03-23 07:38:17 -08:00
parisc
parport [SERIAL] Merge avlab serial board entries in parport_serial 2006-03-20 20:08:22 +00:00
pci [PATCH] acpiphp: fix acpi_path_name 2006-03-23 14:35:17 -08:00
pcmcia [PATCH] handle errors returned by platform_get_irq*() 2006-03-20 13:42:57 -08:00
pnp [PATCH] PnPBIOS: Missing SMALL_TAG_ENDDEP tag 2006-03-23 07:38:16 -08:00
rapidio
s390 [PATCH] sem2mutex: blockdev #2 2006-03-23 07:38:11 -08:00
sbus [SPARC]: Respect vm_page_prot in io_remap_page_range(). 2006-03-22 01:15:13 -08:00
scsi [PATCH] sem2mutex: drivers/scsi/ide-scsi.c 2006-03-23 07:38:10 -08:00
serial [PATCH] kill _INLINE_ 2006-03-23 07:38:16 -08:00
sh
sn Pull sem2mutex-ioc4 into release branch 2006-03-21 08:17:15 -08:00
spi
tc [PATCH] kill _INLINE_ 2006-03-23 07:38:16 -08:00
telephony
usb Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 2006-03-21 09:25:47 -08:00
video Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 2006-03-22 10:56:57 -08:00
w1
zorro
Kconfig
Makefile