summaryrefslogtreecommitdiffstats
path: root/include/asm-generic/sockios.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-05-20 20:06:24 +0200
committerThomas Gleixner <tglx@linutronix.de>2011-05-20 20:08:05 +0200
commit250f972d85effad5b6e10da4bbd877e6a4b503b6 (patch)
tree007393a6fc6439af7e0121dd99a6f9f9fb8405bc /include/asm-generic/sockios.h
parent7372b0b122af0f6675f3ab65bfd91c8a438e0480 (diff)
parentbbe7b8bef48c567f5ff3f6041c1fb011292e8f12 (diff)
downloadblackbird-op-linux-250f972d85effad5b6e10da4bbd877e6a4b503b6.tar.gz
blackbird-op-linux-250f972d85effad5b6e10da4bbd877e6a4b503b6.zip
Merge branch 'timers/urgent' into timers/core
Reason: Get upstream fixes and kfree_rcu which is necessary for a follow up patch. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-generic/sockios.h')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud