summaryrefslogtreecommitdiff
path: root/include/uapi/linux/pkt_sched.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2013-03-18 06:40:50 +0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-03-18 06:40:50 +0400
commit688d794c4c3f8b08c814381ee2edd3ede5856056 (patch)
treeef680add71e2a9588d07d8b594edbc1b5cd127d7 /include/uapi/linux/pkt_sched.h
parent16142655269aaf580488e074eabfdcf0fb4e3687 (diff)
parenta937536b868b8369b98967929045f1df54234323 (diff)
downloadlinux-688d794c4c3f8b08c814381ee2edd3ede5856056.tar.xz
Merge tag 'v3.9-rc3' into next
Merge with mainline to bring in module_platform_driver_probe() and devm_ioremap_resource().
Diffstat (limited to 'include/uapi/linux/pkt_sched.h')
0 files changed, 0 insertions, 0 deletions