diff options
| author | Linus Torvalds | 2009-04-24 16:45:52 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2009-04-24 16:45:52 +0200 |
| commit | dc0046c7586da5db7561dd8b8e09b40d29ade5fa (patch) | |
| tree | 05ab773b89fec9b2f3fcab67875894d2ea98aee2 /net/mac80211/rx.c | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/... (diff) | |
| parent | sparc: Fix bus type probing for ESP and LE devices. (diff) | |
| download | kernel-qcow2-linux-dc0046c7586da5db7561dd8b8e09b40d29ade5fa.tar.gz kernel-qcow2-linux-dc0046c7586da5db7561dd8b8e09b40d29ade5fa.tar.xz kernel-qcow2-linux-dc0046c7586da5db7561dd8b8e09b40d29ade5fa.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc: Fix bus type probing for ESP and LE devices.
sparc32: Update defconfig.
sparc64: Update defconfig.
Diffstat (limited to 'net/mac80211/rx.c')
0 files changed, 0 insertions, 0 deletions