UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/arch/blackfin
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
..
boot Blackfin: encode cpu-rev into uImage name 2011-01-10 07:18:27 -05:00
configs Blackfin: DNP5370: new board port 2011-01-10 07:18:25 -05:00
include Blackfin: dpmc.h: pull in new pll.h 2011-01-10 07:18:17 -05:00
kernel Blackfin: kgdb_test: make sure to initialize num2 2011-01-10 07:18:23 -05:00
lib Blackfin: optimize strncpy a bit 2010-05-22 14:19:11 -04:00
mach-bf518 Blackfin: boards: add missing "static" to peripheral lists 2011-01-10 07:18:25 -05:00
mach-bf527 Blackfin: boards: add missing "static" to peripheral lists 2011-01-10 07:18:25 -05:00
mach-bf533 Blackfin: boards: add missing "static" to peripheral lists 2011-01-10 07:18:25 -05:00
mach-bf537 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
mach-bf538 Blackfin: boards: add missing "static" to peripheral lists 2011-01-10 07:18:25 -05:00
mach-bf548 Blackfin: boards: add missing "static" to peripheral lists 2011-01-10 07:18:25 -05:00
mach-bf561 Blackfin: boards: add missing "static" to peripheral lists 2011-01-10 07:18:25 -05:00
mach-common Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
mm Blackfin: sram_free_with_lsl: do not ignore return value of sram_free 2011-01-10 07:18:26 -05:00
oprofile Blackfin arch: remove hardware PM code, oprofile not use it 2009-01-07 23:14:39 +08:00
ADI_BSD.txt Blackfin: mass clean up of copyright/licensing info 2009-10-07 04:36:26 -04:00
Kconfig Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 2010-10-28 16:16:39 -07:00
Kconfig.debug Blackfin: drop unused irq_panic()/DEBUG_ICACHE_CHECK 2010-10-25 17:24:00 -04:00
Makefile Blackfin: encode cpu-rev into uImage name 2011-01-10 07:18:27 -05:00