| commit | 6a7ebdf2fd15417e87b4fd02ff411aeaca34da5f | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Jul 14 07:56:40 2011 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Thu Jul 14 07:56:40 2011 -0700 |
| tree | 86b15d8cd3e25c97b348b5a61bdb16c02726a480 | |
| parent | f6b72b6217f8c24f2a54988e58af858b4e66024d [diff] | |
| parent | 51414d41084496aaefd06d7f19eb8206e8bfac2d [diff] |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: net/bluetooth/l2cap_core.c