diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-24 18:43:21 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-24 18:43:21 +0100 |
commit | 5bd2010fbe027b224db2e74a4fdfec9a7b7918d2 (patch) | |
tree | 59106aae3930a3608409c101ec32d68742c8d168 /drivers/firmware/dell_rbu.c | |
parent | drivers: base: Add prototype declaration to the header file (diff) | |
parent | Linux 3.13-rc5 (diff) | |
download | linux-5bd2010fbe027b224db2e74a4fdfec9a7b7918d2.tar.xz linux-5bd2010fbe027b224db2e74a4fdfec9a7b7918d2.zip |
Merge 3.13-rc5 into staging-next
We want these fixes here to handle some merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/firmware/dell_rbu.c')
0 files changed, 0 insertions, 0 deletions