Merge tag 'disintegrate-wimax-20121009' of git://git.infradead.org/users/dhowells...
authorDavid S. Miller <davem@davemloft.net>
Thu, 11 Oct 2012 19:15:35 +0000 (15:15 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 11 Oct 2012 19:15:35 +0000 (15:15 -0400)
UAPI Disintegration 2012-10-09

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

Trivial merge