diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2011-07-15 10:05:24 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-07-15 10:05:24 -0400 |
| commit | 95a943c162d74b20d869917bdf5df11293c35b63 (patch) | |
| tree | c69d5cb97a4d97b6062a276ecdfa8582535193af /fs | |
| parent | net/ps3: Fix gelic RX DMA restart (diff) | |
| parent | mac80211: allow driver to disconnect after resume (diff) | |
| download | linux-dev-95a943c162d74b20d869917bdf5df11293c35b63.tar.xz linux-dev-95a943c162d74b20d869917bdf5df11293c35b63.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
net/bluetooth/l2cap_core.c
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions