Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Aug 2010 01:27:40 +0000 (18:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Aug 2010 01:27:40 +0000 (18:27 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
  Blackfin: wire up new fanotify/prlimit64 syscalls
  ADI/ASoC: add MAINTAINERS entries
  Blackfin: fix hweight breakage


Trivial merge