]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'akpm' (Andrew's patch-bomb)
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 May 2012 22:56:25 +0000 (15:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 May 2012 22:56:25 +0000 (15:56 -0700)
commitcc71a84db111edb9b20d0b8afc7525b97ab896b6
tree22f8498c47467f468dce6c3bca0eb1f3a0c9ade0
parent0ce56e79f0d66645875ca11b126c9abeec37dcba
parent525f78ab250c982acbf55eee8bb7120992ec2b44
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
fs/proc/base.c