Merge commit 'linus/master' into bkl/core
authorFrederic Weisbecker <fweisbec@gmail.com>
Sun, 8 Aug 2010 23:49:58 +0000 (01:49 +0200)
committerFrederic Weisbecker <fweisbec@gmail.com>
Mon, 9 Aug 2010 00:14:15 +0000 (02:14 +0200)
commitd9a145fb6e5f37b9903dea8371ab5c3e34e8e2d1
treee2b4bb46fa00f0ad20447e40dba6fb21a4ae0815
parentc9243f5bdd6637b2bb7dc254b54d9edf957ef17e
parent45d7f32c7a43cbb9592886d38190e379e2eb2226
Merge commit 'linus/master' into bkl/core

Merge reason: The staging tree has introduced the easycap
driver lately. We need the latest updates to pushdown the
bkl in its ioctl helper.
drivers/media/video/v4l2-dev.c
fs/compat_ioctl.c