diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-16 15:46:04 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-16 15:46:04 (GMT) |
| commit | 7e111565b70e57ae45d154d79581ecc591d19d9a (patch) | |
| tree | 9dc8ad5b2ced2b86d09af27242b46ff18a1a75ac /drivers/s390/cio/ioasm.h | |
| parent | 62735e5231e2de4c491c7cd52f83ce0fe64b4c36 (diff) | |
| parent | d38e0e3fed4f58bcddef4dc93a591dfe2f651cb0 (diff) | |
| download | linux-fsl-qoriq-7e111565b70e57ae45d154d79581ecc591d19d9a.tar.xz | |
Merge tag 'staging-3.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging tree fix from Greg Kroah-Hartman:
"Here is a single patch, a revert of an android driver patch, that
resolves a bug that has been reported in the Android alarm driver.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
* tag 'staging-3.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
Revert "Staging: Android alarm: IOCTL command encoding fix"
Diffstat (limited to 'drivers/s390/cio/ioasm.h')
0 files changed, 0 insertions, 0 deletions