OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
linux/arch/powerpc/platforms/85xx
History
Linus Torvalds 008d23e485 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: (43 commits)
  Documentation/trace/events.txt: Remove obsolete sched_signal_send.
  writeback: fix global_dirty_limits comment runtime -> real-time
  ppc: fix comment typo singal -> signal
  drivers: fix comment typo diable -> disable.
  m68k: fix comment typo diable -> disable.
  wireless: comment typo fix diable -> disable.
  media: comment typo fix diable -> disable.
  remove doc for obsolete dynamic-printk kernel-parameter
  remove extraneous 'is' from Documentation/iostats.txt
  Fix spelling milisec -> ms in snd_ps3 module parameter description
  Fix spelling mistakes in comments
  Revert conflicting V4L changes
  i7core_edac: fix typos in comments
  mm/rmap.c: fix comment
  sound, ca0106: Fix assignment to 'channel'.
  hrtimer: fix a typo in comment
  init/Kconfig: fix typo
  anon_inodes: fix wrong function name in comment
  fix comment typos concerning "consistent"
  poll: fix a typo in comment
  ...

Fix up trivial conflicts in:
 - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
 - fs/ext4/ext4.h

Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
 		2011-01-13 10:05:56 -08:00
..
Kconfig powerpc/fsl-booke: Add p5020 DS board support 2010-10-14 00:55:18 -05:00
Makefile powerpc/fsl-booke: Add p5020 DS board support 2010-10-14 00:55:18 -05:00
corenet_ds.c lmb: rename to memblock 2010-07-14 17:14:00 +10:00
corenet_ds.h powerpc/p4080: Add basic support for p4080ds platform 2009-11-20 16:45:38 -06:00
ksi8560.c powerpc/85xx: Move gianfar mdio nodes under the ethernet nodes 2009-03-24 08:35:13 -05:00
mpc85xx_ads.c powerpc/85xx: Move gianfar mdio nodes under the ethernet nodes 2009-03-24 08:35:13 -05:00
mpc85xx_cds.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask 2009-03-30 18:00:26 -07:00
mpc85xx_ds.c lmb: rename to memblock 2010-07-14 17:14:00 +10:00
mpc85xx_mds.c ppc: fix comment typo singal -> signal 2011-01-03 16:10:41 +01:00
mpc85xx_rdb.c powerpc/85xx: Added P1020RDB Platform support. 2009-11-11 21:43:16 -06:00
mpc8536_ds.c lmb: rename to memblock 2010-07-14 17:14:00 +10:00
p1022_ds.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 2010-10-25 08:32:05 -07:00
p3041_ds.c powerpc/fsl-booke: Add p3041 DS board support 2010-10-14 00:53:07 -05:00
p4080_ds.c powerpc/p4080: Add basic support for p4080ds platform 2009-11-20 16:45:38 -06:00
p5020_ds.c powerpc/fsl-booke: Add p5020 DS board support 2010-10-14 00:55:18 -05:00
sbc8548.c powerpc/85xx: Move gianfar mdio nodes under the ethernet nodes 2009-03-24 08:35:13 -05:00
sbc8560.c powerpc/85xx: sbc8560 - Fix warm reboot with board specific reset function 2009-08-24 20:48:12 -05:00
smp.c powerpc/85xx: flush dcache before resetting cores 2010-10-14 00:52:52 -05:00
socrates.c powerpc/85xx: Stop using ppc_md.init on socrates 2009-06-23 08:09:55 -05:00
socrates_fpga_pic.c powerpc/85xx: Convert socrates_fpga_pic_lock to raw_spinlock 2010-03-04 10:42:57 -06:00
socrates_fpga_pic.h powerpc/85xx: Add support for the "socrates" board (MPC8544). 2009-03-27 06:42:08 -05:00
stx_gp3.c powerpc: Remove trailing space in messages 2010-02-09 13:56:23 +11:00
tqm85xx.c of/flattree: Add of_flat_dt_match() helper function 2011-01-01 13:03:25 -07:00
xes_mpc85xx.c of: add 'of_' prefix to machine_is_compatible() 2010-02-09 08:33:00 -07:00