Merge tag 'disintegrate-sparc-20121009' of git://git.infradead.org/users/dhowells...
authorDavid S. Miller <davem@davemloft.net>
Tue, 9 Oct 2012 16:54:30 +0000 (09:54 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 9 Oct 2012 16:54:30 +0000 (09:54 -0700)
UAPI Disintegration 2012-10-09

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge