Commit 4b7bd364 authored 14 years ago by Jiri Kosina

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.

parents c0d8768a 90a8a73c

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing with 233 additions and 187 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment