diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:41:27 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:41:27 +0200 |
| commit | 2fb5e1e101d1b1c9a1aeca7ad99a02b49241ba7b (patch) | |
| tree | 45c4575110c61ca181196c038e1579f0f4fb0174 /drivers/net/wireless/orinoco.h | |
| parent | x86, paravirt-spinlocks: fix boot hang (diff) | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-2fb5e1e101d1b1c9a1aeca7ad99a02b49241ba7b.tar.xz linux-2fb5e1e101d1b1c9a1aeca7ad99a02b49241ba7b.zip | |
Merge branch 'linus' into x86/paravirt-spinlocks
Conflicts:
arch/x86/kernel/Makefile
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/wireless/orinoco.h')
0 files changed, 0 insertions, 0 deletions