Merge branch 'master' into upstream

Conflicts:

	net/ieee80211/ieee80211_crypt_tkip.c
	net/ieee80211/ieee80211_crypt_wep.c

1 files changed, 11 insertions, 0 deletions

diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index f6977708585c..f7ca0b09075d 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -148,6 +148,17 @@ struct ccw_device_id {
 #define CCW_DEVICE_ID_MATCH_DEVICE_TYPE         0x04
 #define CCW_DEVICE_ID_MATCH_DEVICE_MODEL        0x08
 
+/* s390 AP bus devices */
+struct ap_device_id {
+        __u16 match_flags;      /* which fields to match against */
+        __u8 dev_type;          /* device type */
+        __u8 pad1;
+        __u32 pad2;
+        kernel_ulong_t driver_info;
+};
+
+#define AP_DEVICE_ID_MATCH_DEVICE_TYPE          0x01
+
 
 #define PNP_ID_LEN      8
 #define PNP_MAX_DEVICES 8