diff options
author | 2010-08-09 01:49:58 +0200 | |
---|---|---|
committer | 2010-08-09 02:14:15 +0200 | |
commit | d9a145fb6e5f37b9903dea8371ab5c3e34e8e2d1 (patch) | |
tree | e2b4bb46fa00f0ad20447e40dba6fb21a4ae0815 /drivers/message/fusion/lsi/mpi_log_sas.h | |
parent | autofs/autofs4: Move compat_ioctl handling into fs (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile (diff) | |
download | linux-dev-d9a145fb6e5f37b9903dea8371ab5c3e34e8e2d1.tar.xz linux-dev-d9a145fb6e5f37b9903dea8371ab5c3e34e8e2d1.zip |
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.
Diffstat (limited to 'drivers/message/fusion/lsi/mpi_log_sas.h')
0 files changed, 0 insertions, 0 deletions