]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
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)
commit2e9e018ecd836d92cc4735b4d878d8b20c08b070
tree7312bfc1a70baecc913a51234c28e2465d524120
parent6e0c64f4ddf4a76a04108c1e24132d5d7dea8872
parentf3411b16c790e52b5abe174b33c7d213dbf5c259
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin

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