diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-31 20:53:12 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-31 20:53:12 -0700 |
commit | e9723bf2ad1b7384e8d475e5356f51a1f35a8934 (patch) | |
tree | d9e6008e3bc147391634299dfb0f010591d52063 /include/linux/b1pcmcia.h | |
parent | 79f284d29bbf7852093d0262c097e8faee32bc03 (diff) | |
parent | 69e273c0b0a3c337a521d083374c918dc52c666f (diff) |
Merge 3.17-rc3 into staging-next
We want the staging bugfixes in this branch as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/b1pcmcia.h')
0 files changed, 0 insertions, 0 deletions