Merge tag 'nfc-next-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 11 Jun 2012 18:46:04 +0000 (14:46 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 11 Jun 2012 18:46:04 +0000 (14:46 -0400)
commit2e48686835370dfe78697839ca293d250793809d
tree50a926aea227a9c8d6957515748a307edad63481
parent934b9d1ed71cca5a220ec13e3f76d6aebf5183da
parent51ad304cc8db5589d1e7b0a9df3858381753d788
Merge tag 'nfc-next-3.6-1' of git://git./linux/kernel/git/sameo/nfc-3.0