diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-26 16:35:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-26 16:35:46 -0700 |
| commit | eba966a4e780199e31e8fd1d21bc9d187b1c9eaf (patch) | |
| tree | 9197d7ac5022217c7d441b425cbbd245e6a19746 /net/unix/af_unix.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid (diff) | |
| parent | uwb: build UWB before USB/WUSB (diff) | |
| download | linux-dev-eba966a4e780199e31e8fd1d21bc9d187b1c9eaf.tar.xz linux-dev-eba966a4e780199e31e8fd1d21bc9d187b1c9eaf.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: build UWB before USB/WUSB
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions