Merge branch 'linus' into percpu-cpumask-x86-for-linus-2

Conflicts:
	arch/sparc/kernel/time_64.c
	drivers/gpu/drm/drm_proc.c

Manual merge to resolve build warning due to phys_addr_t type change
on x86:

	drivers/gpu/drm/drm_info.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 0 insertions, 10 deletions

diff --git a/drivers/net/wireless/libertas/radiotap.h b/drivers/net/wireless/libertas/radiotap.h
index f8eb9097ff0a..d16b26416e82 100644
--- a/drivers/net/wireless/libertas/radiotap.h
+++ b/drivers/net/wireless/libertas/radiotap.h
@@ -33,22 +33,12 @@ struct rx_radiotap_hdr {
         struct ieee80211_radiotap_header hdr;
         u8 flags;
         u8 rate;
-        u16 chan_freq;
-        u16 chan_flags;
-        u8 antenna;
         u8 antsignal;
-        u16 rx_flags;
-#if 0
-        u8 pad[IEEE80211_RADIOTAP_HDRLEN - 18];
-#endif
 } __attribute__ ((packed));
 
 #define RX_RADIOTAP_PRESENT (                   \
         (1 << IEEE80211_RADIOTAP_FLAGS) |       \
         (1 << IEEE80211_RADIOTAP_RATE) |        \
-        (1 << IEEE80211_RADIOTAP_CHANNEL) |     \
-        (1 << IEEE80211_RADIOTAP_ANTENNA) |     \
         (1 << IEEE80211_RADIOTAP_DB_ANTSIGNAL) |\
-        (1 << IEEE80211_RADIOTAP_RX_FLAGS) |    \
         0)