tree e2b4bb46fa00f0ad20447e40dba6fb21a4ae0815
parent c9243f5bdd6637b2bb7dc254b54d9edf957ef17e
parent 45d7f32c7a43cbb9592886d38190e379e2eb2226
author Frederic Weisbecker <fweisbec@gmail.com> 1281311398 +0200
committer Frederic Weisbecker <fweisbec@gmail.com> 1281312855 +0200

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.