aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/xen-netback/interface.c
diff options
context:
space:
mode:
authorJiri Kosina <[email protected]>2013-07-04 13:05:02 +0000
committerJiri Kosina <[email protected]>2013-07-04 13:05:02 +0000
commit21796b39c9e876a46a353a4a9ff9881766a7c176 (patch)
tree119e93184ba04e6cee5798cfd28686100899db1e /drivers/net/xen-netback/interface.c
parentMerge branches 'for-3.11/multitouch', 'for-3.11/sony' and 'for-3.11/upstream'... (diff)
parentHID: wacom: Intuos4 battery charging changes (diff)
parentHID: wiimote: support Nintendo Wii U Pro Controller (diff)
downloadkernel-21796b39c9e876a46a353a4a9ff9881766a7c176.tar.gz
kernel-21796b39c9e876a46a353a4a9ff9881766a7c176.zip
Merge branches 'for-3.11/wacom-fixed' and 'for-3.11/wiimote' into for-linus