Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6
authorDavid S. Miller <davem@davemloft.net>
Sun, 14 Jun 2009 00:08:11 +0000 (17:08 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 14 Jun 2009 00:08:11 +0000 (17:08 -0700)

Trivial merge