diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-18 15:22:45 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-18 15:22:45 +0200 |
commit | 5b1f6d81e4c63ae30d92678cc35081001add7674 (patch) | |
tree | 8980816357cfe8df56ca9735da73b75c1ed6d235 /drivers/gpu/drm/drm_usb.c | |
parent | powerpc/BSR: cleanup the error path of bsr_init (diff) | |
parent | Linux 3.5-rc7 (diff) | |
download | linux-5b1f6d81e4c63ae30d92678cc35081001add7674.tar.xz linux-5b1f6d81e4c63ae30d92678cc35081001add7674.zip |
Merge 3.5-rc7 into char-misc-next.
This lets us pick up the mei driver changes that we need in order to
handle future merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/drm_usb.c')
0 files changed, 0 insertions, 0 deletions