| commit | d9a145fb6e5f37b9903dea8371ab5c3e34e8e2d1 | [log] [tgz] |
|---|---|---|
| author | Frederic Weisbecker <fweisbec@gmail.com> | Mon Aug 09 01:49:58 2010 +0200 |
| committer | Frederic Weisbecker <fweisbec@gmail.com> | Mon Aug 09 02:14:15 2010 +0200 |
| tree | e2b4bb46fa00f0ad20447e40dba6fb21a4ae0815 | |
| parent | c9243f5bdd6637b2bb7dc254b54d9edf957ef17e [diff] | |
| parent | 45d7f32c7a43cbb9592886d38190e379e2eb2226 [diff] |
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.