]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'akpm' (Fixes from Andrew)
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Nov 2012 05:53:02 +0000 (06:53 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Nov 2012 05:53:02 +0000 (06:53 +0100)
Merge misc fixes from Andrew Morton:
 "Five fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (5 patches)
  h8300: add missing L1_CACHE_SHIFT
  mm: bugfix: set current->reclaim_state to NULL while returning from kswapd()
  fanotify: fix missing break
  revert "epoll: support for disabling items, and a self-test app"
  checkpatch: improve network block comment style checking


Trivial merge