diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-23 22:34:26 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-23 22:34:26 +0100 |
| commit | f988dac7fe4eb1ab0c7b1c5dc6d847f6aad5a1cd (patch) | |
| tree | f84e52e13374550e13f3c1f835c6bdadb200b3d7 /Documentation/ide | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | Staging/vt66*: kconfig, depends on WLAN (diff) | |
| download | linux-f988dac7fe4eb1ab0c7b1c5dc6d847f6aad5a1cd.tar.xz linux-f988dac7fe4eb1ab0c7b1c5dc6d847f6aad5a1cd.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
Staging/vt66*: kconfig, depends on WLAN
Staging: batman-adv: introduce missing kfree
Staging: batman-adv: Add Kconfig dependancies on PROC_FS and PACKET.
Staging: panel: Adjust range for PANEL_KEYPAD in Kconfig
Staging: panel: Fix compilation error with custom lcd charset
Staging: ramzswap: remove ARM specific d-cache hack
Staging: rtl8192x: fix printk formats
Staging: wlan-ng: fix Correct size given to memset
staging: rtl8192su: add USB VID/PID for HWNUm-300
staging: fix rtl8192su compilation errors with mac80211
staging: fix rtl8192e compilation errors with mac80211
Staging: fix rtl8187se compilation errors with mac80211
Staging: rtl8192su: fix test for negative error in rtl8192_rx_isr()
Staging: comedi: jr3_pci: Don't ioremap too much space. Check result.
Staging: comedi: removed "depricated" from COMEDI_CB_BLOCK
Staging: comedi: usbdux.c: fix locking up of the driver when the comedi ringbuffer runs empty
Staging: dst: remove from the tree
Staging: sm7xx: add a new framebuffer driver
Staging: batman: fix debug Kconfig option
Diffstat (limited to 'Documentation/ide')
0 files changed, 0 insertions, 0 deletions