From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Sep 2010 23:45:08 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
X-Git-Tag: v3.0~3326
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6b3d2cc4e07a609fc7354daba2889a260053e5d6;p=platform%2Fkernel%2Flinux-amlogic.git

Merge git://git./linux/kernel/git/gregkh/staging-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  Staging: vt6655: fix buffer overflow
  Revert: "Staging: batman-adv: Adding netfilter-bridge hooks"
---

6b3d2cc4e07a609fc7354daba2889a260053e5d6