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
..
x86	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
Kconfig	Kconfig: Remove useless and sometimes wrong comments	2009-11-09 09:40:56 +01:00
Makefile	create drivers/platform/x86/ from drivers/misc/	2008-12-19 04:42:32 -05:00