| commit | 4b7bd364700d9ac8372eff48832062b936d0793b | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Wed Dec 22 18:57:02 2010 +0100 |
| committer | Jiri Kosina <jkosina@suse.cz> | Wed Dec 22 18:57:02 2010 +0100 |
| tree | 0dbf78c95456a0b02d07fcd473281f04a87e266d | |
| parent | c0d8768af260e2cbb4bf659ae6094a262c86b085 [diff] | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a [diff] |
Merge branch 'master' into for-next 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.