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
..
include/mach	ARM: 6484/1: fix compile warning in mm/init.c	2010-11-21 22:05:56 +00:00
clock.c	ARM: PNX4008: get i2c clock rate from clk API	2010-02-12 17:32:39 +00:00
clock.h	ARM: PNX4008: provide clock enable/disable methods and initialization	2010-02-12 17:32:36 +00:00
core.c	arm: remove machine_desc.io_pg_offst and .phys_io	2010-10-20 00:27:46 -04:00
dma.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
gpio.c	[ARM] fix pnx4008	2009-01-08 16:29:43 +00:00
i2c.c	ARM: PNX4008: move i2c_adapter structure inside the drivers private data	2010-02-12 17:32:41 +00:00
irq.c	[ARM] Convert asm/io.h to linux/io.h	2008-09-06 12:10:45 +01:00
Makefile	i2c: New Philips PNX bus driver	2006-12-10 21:21:29 +01:00
Makefile.boot	[ARM] 3466/1: [2/3] Support for Philips PNX4008 platform: chip support	2006-06-18 16:16:55 +01:00
pm.c	suspend: constify platform_suspend_ops	2010-11-16 14:14:02 +01:00
serial.c	[ARM] Convert asm/io.h to linux/io.h	2008-09-06 12:10:45 +01:00
sleep.S	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00
time.c	ARM: PNX4008: remove platform definitions from mach/timex.h	2010-02-12 17:32:39 +00:00
time.h	ARM: PNX4008: remove platform definitions from mach/timex.h	2010-02-12 17:32:39 +00:00