linux-stable/arch/mips/jz4740
Linus Torvalds a44f99c7ef Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits)
  video: change to new flag variable
  scsi: change to new flag variable
  rtc: change to new flag variable
  rapidio: change to new flag variable
  pps: change to new flag variable
  net: change to new flag variable
  misc: change to new flag variable
  message: change to new flag variable
  memstick: change to new flag variable
  isdn: change to new flag variable
  ieee802154: change to new flag variable
  ide: change to new flag variable
  hwmon: change to new flag variable
  dma: change to new flag variable
  char: change to new flag variable
  fs: change to new flag variable
  xtensa: change to new flag variable
  um: change to new flag variables
  s390: change to new flag variable
  mips: change to new flag variable
  ...

Fix up trivial conflict in drivers/hwmon/Makefile
2011-03-20 18:14:55 -07:00
..
board-qi_lb60.c Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
clock-debugfs.c
clock.c
clock.h
dma.c MIPS: JZ4740: Add DMA support. 2010-08-05 13:26:15 +01:00
gpio.c tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
irq.c MIPS: JZ4740: Add IRQ handler code 2010-08-05 13:26:13 +01:00
irq.h MIPS: JZ4740: Add IRQ handler code 2010-08-05 13:26:13 +01:00
Kconfig MIPS: JZ4740: Add qi_lb60 board support 2010-08-05 13:26:20 +01:00
Makefile mips: change to new flag variable 2011-03-17 14:02:56 +01:00
Platform MIPS: jz4740: Fix Kbuild Platform file. 2010-10-19 18:32:39 +01:00
platform.c watchdog: add JZ4740 watchdog driver 2011-03-15 16:01:44 +00:00
pm.c suspend: constify platform_suspend_ops 2010-11-16 14:14:02 +01:00
prom.c MIPS: jz4740: Fix section mismatch in prom.c 2010-12-16 18:10:53 +00:00
pwm.c MIPS: JZ4740: Add PWM support 2010-08-05 13:26:16 +01:00
reset.c MIPS: JZ4740: Add power-management and system reset support 2010-08-05 13:26:14 +01:00
reset.h MIPS: JZ4740: Add power-management and system reset support 2010-08-05 13:26:14 +01:00
serial.c MIPS: JZ4740: Add serial support 2010-08-05 13:26:16 +01:00
serial.h MIPS: JZ4740: Add serial support 2010-08-05 13:26:16 +01:00
setup.c MIPS: JZ4740: Add setup code 2010-08-05 13:26:14 +01:00
time.c MIPS: JZ4740: Add clocksource/clockevent support. 2010-08-05 13:26:14 +01:00
timer.c MIPS: JZ4740: Add timer support 2010-08-05 13:26:13 +01:00
timer.h MIPS: JZ4740: Add timer support 2010-08-05 13:26:13 +01:00