davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
e195aa3039
kernel-ark/arch/arm/mach-s3c2440
History
Linus Torvalds 229aebb873 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  Update broken web addresses in arch directory.
  Update broken web addresses in the kernel.
  Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
  Revert "Fix typo: configuation => configuration" partially
  ida: document IDA_BITMAP_LONGS calculation
  ext2: fix a typo on comment in ext2/inode.c
  drivers/scsi: Remove unnecessary casts of private_data
  drivers/s390: Remove unnecessary casts of private_data
  net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
  drivers/infiniband: Remove unnecessary casts of private_data
  drivers/gpu/drm: Remove unnecessary casts of private_data
  kernel/pm_qos_params.c: Remove unnecessary casts of private_data
  fs/ecryptfs: Remove unnecessary casts of private_data
  fs/seq_file.c: Remove unnecessary casts of private_data
  arm: uengine.c: remove C99 comments
  arm: scoop.c: remove C99 comments
  Fix typo configue => configure in comments
  Fix typo: configuation => configuration
  Fix typo interrest[ing|ed] => interest[ing|ed]
  Fix various typos of valid in comments
  ...

Fix up trivial conflicts in:
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/usb/gadget/rndis.c
	net/irda/irnet/irnet_ppp.c
2010-10-24 13:41:39 -07:00
..
include/mach ARM: S3C24XX: Merge s3c2442 and s3c2440 machines into mach-s3c2440 2010-02-01 17:55:25 +00:00
clock.c ARM: SAMSUNG: Reduce size of struct clk. 2010-01-15 17:10:10 +09:00
dma.c ARM: SAMSUNG: Remove dma-plat.h to allow plat-s3c64xx to be removed 2010-02-21 23:10:35 +00:00
dsc.c ARM: S3C244X: Merge plat-s3c24xx s3c2440.h and s3c2442.h into s3c244x.h 2010-02-01 17:56:46 +00:00
irq.c ARM: S3C: Update Simtec copyright statements from , to - 2009-12-01 01:33:51 +00:00
Kconfig ARM: Merge for-2635/gpio2 2010-05-19 18:04:08 +09:00
mach-anubis.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-at2440evb.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
mach-gta02.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-mini2440.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-nexcoder.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-osiris-dvs.c ARM: OSIRIS: DVS (Dynamic Voltage Scaling) supoort. 2009-12-01 01:33:49 +00:00
mach-osiris.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-rx1950.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-rx3715.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
mach-smdk2440.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
Makefile ARM: S3C2440: Add HP iPAQ RX1950 machine support 2010-05-12 09:19:01 +09:00
s3c244x-clock.c ARM: S3C24XX: Move S3C2440/S3C2442 plat-s3c24xx support to mach-s3c2440 2010-02-01 17:56:04 +00:00
s3c244x-irq.c ARM: S3C24XX: Move S3C2440/S3C2442 plat-s3c24xx support to mach-s3c2440 2010-02-01 17:56:04 +00:00
s3c244x.c ARM: S3C244X: Merge plat-s3c24xx s3c2440.h and s3c2442.h into s3c244x.h 2010-02-01 17:56:46 +00:00
s3c2440-cpufreq.c ARM: S3C2440: Fix s3c2440 cpufreq compilation post move. 2010-03-15 22:43:12 +00:00
s3c2440-pll-12000000.c ARM: S3C2440: Fix plat-s3c24xx move of s3c2440/s3c2442 support 2010-03-04 23:14:44 +00:00
s3c2440-pll-16934400.c ARM: S3C2440: Fix plat-s3c24xx move of s3c2440/s3c2442 support 2010-03-04 23:14:44 +00:00
s3c2440.c ARM: S3C24XX: Add the gpio pull configuration for pull-up 2010-05-06 09:25:57 +09:00
s3c2442.c ARM: S3C244X: Move S3C2442 code into S3C2440 2010-02-01 17:55:31 +00:00