The following commit has been merged in the master branch: commit 4dc6ec26fe7d9f89349d4c0c654e2f07420f4b27 Merge: 7be799a70ba3dd90a59e8d2c72bbe06020005b3f ca06c6eb9a31ae782e74596231fb23df4fc5e46d Author: David S. Miller davem@conan.davemloft.net Date: Sat May 14 22:47:51 2011 -0400

Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge