Merge branch '20120221_isdn' of git://repo.or.cz/linux-2.6/trivial-mods
authorDavid S. Miller <davem@davemloft.net>
Tue, 21 Feb 2012 20:25:15 +0000 (15:25 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 21 Feb 2012 20:25:15 +0000 (15:25 -0500)

Trivial merge