summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6Linus Torvalds2009-12-2312-40/+72
|\
| * devtmpfs: unlock mutex in case of string allocation errorKay Sievers2009-12-231-2/+5
| * Driver core: export platform_device_register_data as a GPL symbolMichael Hennerich2009-12-231-0/+1
| * driver core: Prevent reference to freed memory on error pathPhil Carmody2009-12-231-1/+1
| * Driver-core: Fix bogus 0 error return in device_add()Thomas Gleixner2009-12-231-1/+3
| * Driver core: driver_attribute parameters can often be const*Phil Carmody2009-12-234-8/+8
| * Driver core: bin_attribute parameters can often be const*Phil Carmody2009-12-234-11/+16
| * Driver core: device_attribute parameters can often be const*Phil Carmody2009-12-233-8/+10
| * Doc/stable rules: add new cherry-pick logicSebastian Andrzej Siewior2009-12-231-2/+22
| * vfs: get_sb_single() - do not pass options twiceKay Sievers2009-12-231-1/+2
| * devtmpfs: Convert dirlock to a mutexThomas Gleixner2009-12-231-7/+5
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6Linus Torvalds2009-12-2352-4672/+3696
|\ \
| * | Staging/vt66*: kconfig, depends on WLANRandy Dunlap2009-12-232-2/+2
| * | Staging: batman-adv: introduce missing kfreeJulia Lawall2009-12-231-1/+3
| * | Staging: batman-adv: Add Kconfig dependancies on PROC_FS and PACKET.Andrew Lunn2009-12-231-0/+1
| * | Staging: panel: Adjust range for PANEL_KEYPAD in KconfigPeter Huewe2009-12-231-1/+1
| * | Staging: panel: Fix compilation error with custom lcd charsetPeter Huewe2009-12-231-1/+1
| * | Staging: ramzswap: remove ARM specific d-cache hackNitin Gupta2009-12-232-26/+3
| * | Staging: rtl8192x: fix printk formatsRandy Dunlap2009-12-234-8/+8
| * | Staging: wlan-ng: fix Correct size given to memsetJulia Lawall2009-12-231-1/+1
| * | staging: rtl8192su: add USB VID/PID for HWNUm-300Stephane Glondu2009-12-231-0/+2
| * | staging: fix rtl8192su compilation errors with mac80211George Kadianakis2009-12-235-19/+19
| * | staging: fix rtl8192e compilation errors with mac80211George Kadianakis2009-12-237-38/+38
| * | Staging: fix rtl8187se compilation errors with mac80211George Kadianakis2009-12-236-20/+20
| * | Staging: rtl8192su: fix test for negative error in rtl8192_rx_isr()Roel Kluin2009-12-231-1/+1
| * | Staging: comedi: jr3_pci: Don't ioremap too much space. Check result.Ian Abbott2009-12-231-2/+5
| * | Staging: comedi: removed "depricated" from COMEDI_CB_BLOCKBernd Porr2009-12-231-1/+1
| * | Staging: comedi: usbdux.c: fix locking up of the driver when the comedi ringb...Bernd Porr2009-12-231-1/+4
| * | Staging: dst: remove from the treeGreg Kroah-Hartman2009-12-2311-4550/+0
| * | Staging: sm7xx: add a new framebuffer driverWu Zhangjin2009-12-239-0/+3586
| * | Merge branch 'master' of /home/gregkh/linux/git/torvalds-2.6Greg Kroah-Hartman2009-12-233989-89087/+275983
| |\|
| * | Staging: batman: fix debug Kconfig optionGreg Kroah-Hartman2009-12-121-1/+1
* | | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2009-12-234-39/+131
|\ \ \
| * | | ocfs2: Set i_nlink properly during reflink.Tao Ma2009-12-181-0/+3
| * | | ocfs2: Add reflinked file's inode to inode hash eariler.Tao Ma2009-12-181-1/+1
| * | | ocfs2: refcounttree.c cleanup.Tao Ma2009-12-031-25/+8
| * | | ocfs2: Find proper end cpos for a leaf refcount block.Tao Ma2009-12-033-13/+119
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw...Linus Torvalds2009-12-2310-34/+48
|\ \ \ \
| * \ \ \ Merge branch 'fix/hda' into for-linusTakashi Iwai2009-12-235-15/+41
| |\ \ \ \
| | * | | | ALSA: hda - Add STAC9205 PCI_QUIRK for Dell Vostro 1700Anisse Astier2009-12-231-0/+3
| | * | | | ALSA: hda - Set mixer name after codec patchTakashi Iwai2009-12-231-5/+5
| | * | | | ALSA: hda - Add MSI blacklistTakashi Iwai2009-12-221-0/+1
| | * | | | ALSA: hda - Add support for the new 27 inch IMacsRafael Avila de Espindola2009-12-222-1/+22
| | * | | | ALSA: hda - Fix NULL dereference with enable_beep=0 optionTakashi Iwai2009-12-221-9/+10
| * | | | | Merge branch 'fix/asoc' into for-linusTakashi Iwai2009-12-233-3/+5
| |\ \ \ \ \
| | * | | | | ASoC: Do not write to invalid registers on the wm9712.Eric Millbrandt2009-12-231-1/+2
| | * | | | | ASoC: add missing parameter to mx27vis_hifi_hw_free()Guennadi Liakhovetski2009-12-221-1/+2
| | * | | | | ASoC: sh: FSI:: don't check platform_get_irq's return value against zeroUwe Kleine-König2009-12-221-1/+1
| * | | | | | Merge branch 'fix/misc' into for-linusTakashi Iwai2009-12-232-16/+2
| |\ \ \ \ \ \
| | * | | | | | ALSA: sound/core/pcm_timer.c: use lib/gcd.cFlorian Fainelli2009-12-222-16/+2