| commit | bcc66c0b8881f88459f9ac21038455bcafacdc6e | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Jun 25 09:31:00 2012 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Jun 25 09:31:00 2012 -0700 |
| tree | b402e677253c3fc1038ca4a52fc54fc223261133 | |
| parent | 1c1b86215730ef07d8851c2247b9ecf73038d05d [diff] | |
| parent | 6b16351acbd415e66ba16bf7d473ece1574cf0bc [diff] |
Merge 3.5-rc4 into staging-next This picks up the staging changes made in 3.5-rc4 so that everyone can sync up properly. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>