diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2009-12-30 15:25:08 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-12-30 15:25:08 -0500 |
| commit | 891dc5e73783eeabd2a704a9425e2a199b39c9f9 (patch) | |
| tree | 9b4478941c486d47a71bfce455b896c5dda7e811 /net/can/proc.c | |
| parent | mac80211: annotate sleeping driver ops (diff) | |
| parent | Revert "b43: Enforce DMA descriptor memory constraints" (diff) | |
| download | wireguard-linux-891dc5e73783eeabd2a704a9425e2a199b39c9f9.tar.xz wireguard-linux-891dc5e73783eeabd2a704a9425e2a199b39c9f9.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/libertas/scan.c
Diffstat (limited to 'net/can/proc.c')
0 files changed, 0 insertions, 0 deletions