tree 22f8498c47467f468dce6c3bca0eb1f3a0c9ade0
parent 30a08bf2d31d275c6fc71dd1811342777e95c831
parent 93c2d656c7120e29de8df5bc17bb2a97664104e9
author Linus Torvalds <torvalds@linux-foundation.org> 1337381785 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1337381785 -0700

Merge branch 'akpm' (Andrew's patch-bomb)

Merge misc fixes from Andrew Morton.

* emailed from Andrew Morton <akpm@linux-foundation.org>: (4 patches)
  frv: delete incorrect task prototypes causing compile fail
  slub: missing test for partial pages flush work in flush_all()
  fs, proc: fix ABBA deadlock in case of execution attempt of map_files/ entries
  drivers/rtc/rtc-pl031.c: configure correct wday for 2000-01-01