diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-02 12:59:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-02 12:59:11 -0800 |
| commit | 94c35de9a918665d9354efe2bafc29ba4b37497a (patch) | |
| tree | 09a4877133142ae8f6c58b7cb72eb5e3e06f2df0 /net/key/Makefile | |
| parent | 8733cb29d60fd2ca6c1f50f69f9b90fbfcd1879b (diff) | |
| parent | 251d380034c6c34efe75ffb89d863558ba68ec6a (diff) | |
| download | linux-94c35de9a918665d9354efe2bafc29ba4b37497a.tar.bz2 | |
Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (27 commits)
Staging: rt2870: Add USB ID for Buffalo Airstation WLI-UC-GN
staging: easycap needs smp_lock.h, fixes build error
Staging: batman-adv: ensure that eth_type_trans gets linear memory
Staging: batman-adv: Don't remove interface with spinlock held
staging: brcm80211: updated maintainers contact information
staging: fix winbond build, needs delay.h
Staging: line6: fix up my fixup for some sysfs attribute permissions
Staging: zram: fix up my fixup for some sysfs attribute permissions
Staging: udlfb: fix up my fixup for some sysfs attribute permissions
Staging: samsung-laptop: fix up my fixup for some sysfs attribute permissions
Staging: iio: adis16220: fix up my fixup for some sysfs attribute permissions
Staging: frontier: fix up my fixup for some sysfs attribute permissions
Staging: asus_oled: fix up my fixup for some sysfs attribute permissions
staging: spectra: fix build error
Staging: intel_sst: fix memory leak
Staging: rtl8712: signedness bug in init
staging: rtl8187se: Change panic to warn when RF switch turned off
staging: comedi: fix memory leak
Staging: quickstart: free after input_unregister_device()
Staging: speakup: free after input_unregister_device()
...
Diffstat (limited to 'net/key/Makefile')
0 files changed, 0 insertions, 0 deletions