git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cdd854b b12d199)
Staging: Merge staging-next into Linus's tree
authorGreg Kroah-Hartman <gregkh@suse.de>
Thu, 5 Aug 2010 21:18:03 +0000 (14:18 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 5 Aug 2010 21:18:03 +0000 (14:18 -0700)
Conflicts:
drivers/staging/Kconfig
drivers/staging/batman-adv/bat_sysfs.c
drivers/staging/batman-adv/device.c
drivers/staging/batman-adv/hard-interface.c
drivers/staging/cx25821/cx25821-audups11.c

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Trivial merge
Pandora Kernel Repository