Jiri Kosina 4b7bd36470 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.		2010-12-22 18:57:02 +01:00
..
Kconfig	…
Makefile	…
TODO	Staging: samsung-laptop: add TODO file	2009-12-11 12:23:23 -08:00
samsung-laptop.c	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00