git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0d8768 90a8a73)
Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Wed, 22 Dec 2010 17:57:02 +0000 (18:57 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 22 Dec 2010 17:57:02 +0000 (18:57 +0100)
Conflicts:
MAINTAINERS
arch/arm/mach-omap2/pm24xx.c
drivers/scsi/bfa/bfa_fcpim.c

Needed to update to apply fixes for which the old branch was too
outdated.


Trivial merge
Pandora Kernel Repository