From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 May 2012 22:56:25 +0000 (-0700)
Subject: Merge branch 'akpm' (Andrew's patch-bomb)
X-Git-Url: http://git.alex.org.uk

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
---

73f1f5dd3ee3ec6e20768d831d9759b0330fad0e