git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69964ea 5bb196a)
Merge 3.4-rc5 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 2 May 2012 18:48:07 +0000 (11:48 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 2 May 2012 18:48:07 +0000 (11:48 -0700)
This resolves the conflict in:
drivers/staging/vt6656/ioctl.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Trivial merge
Pandora Kernel Repository