diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-02 19:20:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-02 19:20:17 -0800 |
| commit | 17294ab2ca8e8c46f2e4825c55541b2b88e52bf4 (patch) | |
| tree | c44fd3cf1c20c5724e719a3339a5734f2eae7e58 /include/linux/kernel.h | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream (diff) | |
| download | wireguard-linux-17294ab2ca8e8c46f2e4825c55541b2b88e52bf4.tar.xz wireguard-linux-17294ab2ca8e8c46f2e4825c55541b2b88e52bf4.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb
* 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb:
uwb: lock rc->rsvs_lock with spin_lock_bh()
wusb: timeout when waiting for ASL/PZL updates in whci-hcd
uwb: remove unused #include <version.h>'s
wusb: return -ENOTCONN when resetting a port with no connected device
uwb: safely remove all reservations
Diffstat (limited to 'include/linux/kernel.h')
0 files changed, 0 insertions, 0 deletions