Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc...
authorDavid Howells <dhowells@redhat.com>
Tue, 16 Oct 2012 20:28:01 +0000 (21:28 +0100)
committerDavid Howells <dhowells@redhat.com>
Tue, 16 Oct 2012 20:28:01 +0000 (21:28 +0100)

Trivial merge