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 /drivers/scsi/ipr.c | |
parent | ecc96e79202ed7225f7a2e2b7cb5a9e09fc74aa6 (diff) | |
parent | ae5d82cb8d600989338bbda5ea38f5c0ff47175a (diff) |
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 'drivers/scsi/ipr.c')
0 files changed, 0 insertions, 0 deletions