tree 86b15d8cd3e25c97b348b5a61bdb16c02726a480
parent f6b72b6217f8c24f2a54988e58af858b4e66024d
parent 51414d41084496aaefd06d7f19eb8206e8bfac2d
author David S. Miller <davem@davemloft.net> 1310655400 -0700
committer David S. Miller <davem@davemloft.net> 1310655400 -0700

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	net/bluetooth/l2cap_core.c