| commit | 6b3d2cc4e07a609fc7354daba2889a260053e5d6 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 20 Sep 2010 23:45:08 +0000 (20 16:45 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 20 Sep 2010 23:45:08 +0000 (20 16:45 -0700) | ||
| tree | da7e2580c6e2e53ec266c1a20d82778692c2d592 | treesnapshot (tar.gz zip) |
| parent | 0c4ab3453aae7bba4d76a3eb4b289aa53a9f9a60 | commitdiff |
| parent | dd173abfead903c7df54e977535973f3312cd307 | commitdiff |
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"
* 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"