aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-20 16:45:08 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-20 16:45:08 -0700
commit6b3d2cc4e07a609fc7354daba2889a260053e5d6 (patch)
treeda7e2580c6e2e53ec266c1a20d82778692c2d592 /kernel
parent0c4ab3453aae7bba4d76a3eb4b289aa53a9f9a60 (diff)
parentdd173abfead903c7df54e977535973f3312cd307 (diff)
downloadmrst-s0i3-test-6b3d2cc4e07a609fc7354daba2889a260053e5d6.tar.gz
mrst-s0i3-test-6b3d2cc4e07a609fc7354daba2889a260053e5d6.tar.xz
mrst-s0i3-test-6b3d2cc4e07a609fc7354daba2889a260053e5d6.zip
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"
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions