| commit | 7e111565b70e57ae45d154d79581ecc591d19d9a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Nov 16 07:46:04 2012 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Nov 16 07:46:04 2012 -0800 |
| tree | 9dc8ad5b2ced2b86d09af27242b46ff18a1a75ac | |
| parent | 62735e5231e2de4c491c7cd52f83ce0fe64b4c36 [diff] | |
| parent | d38e0e3fed4f58bcddef4dc93a591dfe2f651cb0 [diff] |
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"