| commit | abb434cb0539fb355c1c921f8fd761efbbac3462 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Dec 23 17:13:56 2011 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Fri Dec 23 17:13:56 2011 -0500 |
| tree | 24a7d99ec161f8fd4dc9ff03c9c4cc93be883ce6 | |
| parent | 2494654d4890316e7340fb8b3458daad0474a1b9 [diff] | |
| parent | 6350323ad8def2ac00d77cdee3b79c9b9fba75c4 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Conflicts: net/bluetooth/l2cap_core.c Just two overlapping changes, one added an initialization of a local variable, and another change added a new local variable. Signed-off-by: David S. Miller <davem@davemloft.net>