Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

Browse source

* 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"

...

This commit is contained in:

Linus Torvalds 2010-09-20 16:45:08 -07:00

parent 0c4ab3453a dd173abfea

commit 6b3d2cc4e0

3 changed files with 10 additions and 22 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

13

drivers/staging/batman-adv/hard-interface.c

View file

8

drivers/staging/batman-adv/send.c

View file

11

drivers/staging/vt6655/wpactl.c

View file