leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
92db6d10bc
linux/arch/mips
History
Linus Torvalds 708e16892e Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits)
  Add missing maintainer countries in CREDITS
  Fix bytes <-> kilobytes  typo in Kconfig for ramdisk
  fix a typo in Documentation/pi-futex.txt
  BUG_ON conversion for fs/xfs/
  BUG_ON() conversion in fs/nfsd/
  BUG_ON conversion for fs/reiserfs
  BUG_ON cleanups in arch/i386
  BUG_ON cleanup in drivers/net/tokenring/
  BUG_ON cleanup for drivers/md/
  kerneldoc-typo in led-class.c
  debugfs: spelling fix
  rcutorture: Fix incorrect description of default for nreaders parameter
  parport: Remove space in function calls
  Michal Wronski: update contact info
  Spelling fix: "control" instead of "cotrol"
  reboot parameter in Documentation/kernel-parameters.txt
  Fix copy&waste bug in comment in scripts/kernel-doc
  remove duplicate "until" from kernel/workqueue.c
  ite_gpio fix tabbage
  fix file specification in comments
  ...

Fixed trivial path conflicts due to removed files:
   arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
2006-10-03 16:35:11 -07:00
..
arc Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
au1000 [PATCH] simplify update_times (avoid jiffies/jiffies_64 aliasing problem) 2006-09-29 09:18:15 -07:00
basler/excite [MIPS] Remove excite_flash.c 2006-10-01 23:16:59 +01:00
boot Add .gitignore files for MIPS. 2005-11-07 18:05:37 +00:00
cobalt [SERIAL] Remove wrong asm/serial.h inclusions 2006-10-01 17:09:16 +01:00
configs [MIPS] DECstation defconfig update 2006-10-03 17:59:18 +01:00
ddb5xxx [MIPS] Replace board_timer_setup function pointer by plat_timer_setup. 2006-07-13 21:26:17 +01:00
dec Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-10-03 16:35:11 -07:00
emma2rh [MIPS] Replace board_timer_setup function pointer by plat_timer_setup. 2006-07-13 21:26:17 +01:00
gt64120 [PATCH] simplify update_times (avoid jiffies/jiffies_64 aliasing problem) 2006-09-29 09:18:15 -07:00
jazz [MIPS] Replace board_timer_setup function pointer by plat_timer_setup. 2006-07-13 21:26:17 +01:00
jmr3927 [MIPS] Replace board_timer_setup function pointer by plat_timer_setup. 2006-07-13 21:26:17 +01:00
kernel [MIPS] Fix wreckage after removal of tickadj; convert to GENERIC_TIME. 2006-10-03 17:59:18 +01:00
lasat [SERIAL] Remove wrong asm/serial.h inclusions 2006-10-01 17:09:16 +01:00
lib Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
lib-32 Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
lib-64 Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
math-emu Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mips-boards [MIPS] Atlas: update interrupt handling 2006-09-27 13:37:42 +01:00
mm Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-10-03 16:35:11 -07:00
momentum [PATCH] simplify update_times (avoid jiffies/jiffies_64 aliasing problem) 2006-09-29 09:18:15 -07:00
oprofile [MIPS] Oprofile: Fix build failure due to warning and -Werror. 2006-07-13 21:26:09 +01:00
pci Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-10-03 16:35:11 -07:00
philips/pnx8550 [MIPS] Replace board_timer_setup function pointer by plat_timer_setup. 2006-07-13 21:26:17 +01:00
pmc-sierra [MIPS] Replace board_timer_setup function pointer by plat_timer_setup. 2006-07-13 21:26:17 +01:00
qemu [MIPS] Replace board_timer_setup function pointer by plat_timer_setup. 2006-07-13 21:26:17 +01:00
sgi-ip22 [PATCH] replace cad_pid by a struct pid 2006-10-02 07:57:25 -07:00
sgi-ip27 [PATCH] kill wall_jiffies 2006-10-01 00:39:27 -07:00
sgi-ip32 [PATCH] replace cad_pid by a struct pid 2006-10-02 07:57:25 -07:00
sibyte [MIPS] BCM1480: Mask pending interrupts against c0_status.im. 2006-10-03 17:59:17 +01:00
sni [MIPS] Replace board_timer_setup function pointer by plat_timer_setup. 2006-07-13 21:26:17 +01:00
tx4927 [MIPS] Replace board_timer_setup function pointer by plat_timer_setup. 2006-07-13 21:26:17 +01:00
tx4938 fix file specification in comments 2006-10-03 23:01:26 +02:00
vr41xx [MIPS] vr41xx: Update workpad setup function 2006-07-13 21:26:21 +01:00
defconfig [MIPS] lockdep: update defconfigs 2006-10-01 23:16:57 +01:00
Kconfig [MIPS] Fix wreckage after removal of tickadj; convert to GENERIC_TIME. 2006-10-03 17:59:18 +01:00
Kconfig.debug [MIPS] TRACE_IRQFLAGS_SUPPORT support. 2006-07-13 21:26:09 +01:00
Makefile [MIPS] Remove IT8172-based platforms, ITE 8172G and Globespan IVR support. 2006-10-03 17:59:17 +01:00