The following commit has been merged in the batman-adv/next branch: commit 57f784fed3b9a33084c0cd0f6d08d98f87d2193f Merge: b877f4cf5af86528e07a0182e2b369ded38ccf38 cd17decbd9af41c9548bb108ccf156519f8253ec Author: John W. Linville linville@tuxdriver.com Date: Fri Aug 10 15:13:12 2012 -0400
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next