summaryrefslogtreecommitdiff
path: root/include/uapi
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2014-07-30 12:49:04 -0400
committerTejun Heo <tj@kernel.org>2014-07-30 12:49:04 -0400
commite8f781836dc3335b5533f6e177a105bbe3ee7345 (patch)
treeb6f05b7bf6e69bcc436ab894b7dc84c28c746d1a /include/uapi
parent19f5be0f40922717e2b6e39a9822e7e7f30fd81f (diff)
parent1a112d10f03e83fb3a2fdc4c9165865dec8a3ca6 (diff)
Merge branch 'for-3.16-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata into for-3.17
The scheduled ahci platform patches depend on change in for-3.16-fixes. Pull it into for-3.17. Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include/uapi')
0 files changed, 0 insertions, 0 deletions