]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
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)
commitce6d841e9c0e177a594615dc0e69dd04972a696c
tree61c24c2dcd481502fdc0250407918469b5298a61
parentc0cba03baa0d285b1a8f9d3481be1868df7af1ad
parent6893f5675f54d6452aded27f9a1d5e86a3bddcbe
Merge branch 'akpm' (Fixes from Andrew)

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