linux-dev/arch/arm/mach-mx2, branch master

ARM: imx: rename mach dir for mx21 and mx27 to mach-imx

2010-06-24T13:40:38Z

Finally all imx code should end up there, start with mach-mx2. While touching all files rename some files to use a hyphen instead of an underscore. Signed-off-by: Uwe Kleine-König

ARM: mx2/mx27ads: fold board header in its only user

2010-06-24T13:40:31Z

Moreover remove unused definitions. Signed-off-by: Uwe Kleine-König

ARM: mx2/mx21ads: fold board header in its only user

2010-06-24T13:40:30Z

Signed-off-by: Uwe Kleine-König

ARM: imx: remove empty and unused board headers

2010-06-24T13:40:28Z

Signed-off-by: Uwe Kleine-König

ARM: mx2/mx27_3ds: document alternative names and remove empty header

2010-06-24T13:40:26Z

Signed-off-by: Uwe Kleine-König

Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

2010-05-25T19:06:33Z

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (103 commits) ARM: 6141/1: Add audio support part in arch/arm/mach-w90x900 ARM: 5939/1: ARM: Add option CMDLINE_FORCE to force usage of the in-kernel cmdline ARM: 6140/1: silence a bogus sparse warning in unwind.c ARM: mach-at91: duplicated include ARM: arch/arm/nwfpe/fpsr.h: Checkpatch cleanup ARM: arch/arm/mach-shark/pci.c: Checkpatch cleanup ARM: arch/arm/nwfpe/ChangeLog: Checkpatch cleanup ARM: arch/arm/mach-sa1100/leds.c: Checkpatch cleanup ARM: arch/arm/mach-h720x/common.h: Checkpatch cleanup ARM: arch/arm/mach-footbridge/ebsa285-pci.c: Checkpatch cleanup ARM: arch/arm/mach-clps711x/Makefile.boot: Checkpatch cleanup ARM: arch/arm/boot/bootp/bootp.lds: Checkpatch cleanup ARM: SPEAR6xx: remove duplicated #include ARM: s3c6400_defconfig: Add NAND driver ARM: s3c6400_defconfig: enable sound as modules ARM: s3c6400_defconfig: enable power management ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34 ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34 ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34 ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34 ...

Merge branch 'master' into devel

2010-05-24T22:08:54Z

ARM: 6135/1: mx21/devices: fix USBOTG resource

2010-05-20T22:52:30Z

It got a typo from 988addf82e4c03739375279de73929580a2d4a6a. Signed-off-by: Wolfram Sang Cc: Signed-off-by: Russell King

can: sja1000 platform data fixes

2010-05-18T05:39:48Z

The member "clock" of struct "sja1000_platform_data" is documented as "CAN bus oscillator frequency in Hz" but it's actually used as the CAN clock frequency, which is half of it. To avoid further confusion, this patch fixes it by renaming the member to "osc_freq". That way, also non mainline users will notice the change. The platform code for the relevant boards is updated accordingly. Furthermore, pre-defined values are now used for the members "ocr" and "cdr". Signed-off-by: Wolfgang Grandegger Acked-by: Marc Kleine-Budde Signed-off-by: David S. Miller

arm/mach-mx2: add watchdog device to Phytec-boards

2010-05-17T09:47:03Z

Signed-off-by: Wolfram Sang Cc: Sascha Hauer Signed-off-by: Sascha Hauer