Merge branch 'staging-next' into Linux 3.1
[pandora-kernel.git] / net / bluetooth / l2cap_core.c
Simple merge