| commit | 2e48686835370dfe78697839ca293d250793809d | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Mon Jun 11 14:46:04 2012 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Mon Jun 11 14:46:04 2012 -0400 |
| tree | 50a926aea227a9c8d6957515748a307edad63481 | |
| parent | 934b9d1ed71cca5a220ec13e3f76d6aebf5183da [diff] | |
| parent | 51ad304cc8db5589d1e7b0a9df3858381753d788 [diff] |
Merge tag 'nfc-next-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-3.0