| commit | 033b1142f4bd44a116d1356fe4a0510437ceddf9 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Jul 21 13:38:42 2011 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Thu Jul 21 13:38:42 2011 -0700 |
| tree | d2a971a7dc9f3a1af8035e38419c4c4ad8c22632 | |
| parent | f5caadbb3d8fc0b71533e880c684b2230bdb76ac [diff] | |
| parent | e6625fa48e6580a74b7e700efd7e6463e282810b [diff] |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: net/bluetooth/l2cap_core.c