tree da7e2580c6e2e53ec266c1a20d82778692c2d592
parent 0c4ab3453aae7bba4d76a3eb4b289aa53a9f9a60
parent dd173abfead903c7df54e977535973f3312cd307
author Linus Torvalds <torvalds@linux-foundation.org> 1285026308 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1285026308 -0700

Merge git://git.kernel.org/pub/scm/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"