q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/arch/mips
History
Linus Torvalds 08acd4f8af Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (179 commits)
  ACPI: Fix acpi_processor_idle and idle= boot parameters interaction
  acpi: fix section mismatch warning in pnpacpi
  intel_menlo: fix build warning
  ACPI: Cleanup: Remove unneeded, multiple local dummy variables
  ACPI: video - fix permissions on some proc entries
  ACPI: video - properly handle errors when registering proc elements
  ACPI: video - do not store invalid entries in attached_array list
  ACPI: re-name acpi_pm_ops to acpi_suspend_ops
  ACER_WMI/ASUS_LAPTOP: fix build bug
  thinkpad_acpi: fix possible NULL pointer dereference if kstrdup failed
  ACPI: check a return value correctly in acpi_power_get_context()
  #if 0 acpi/bay.c:eject_removable_drive()
  eeepc-laptop: add hwmon fan control
  eeepc-laptop: add backlight
  eeepc-laptop: add base driver
  ACPI: thinkpad-acpi: bump up version to 0.20
  ACPI: thinkpad-acpi: fix selects in Kconfig
  ACPI: thinkpad-acpi: use a private workqueue
  ACPI: thinkpad-acpi: fluff really minor fix
  ACPI: thinkpad-acpi: use uppercase for "LED" on user documentation
  ...

Fixed conflicts in drivers/acpi/video.c and drivers/misc/intel_menlow.c
manually.
2008-04-30 11:52:52 -07:00
..
au1000 Merge branches 'release', 'acpica', 'bugzilla-10224', 'bugzilla-9772', 'bugzilla-9916', 'ec', 'eeepc', 'idle', 'misc', 'pm-legacy', 'sysfs-links-2.6.26', 'thermal', 'thinkpad' and 'video' into release 2008-04-30 13:58:00 -04:00
basler/excite proc: switch /proc/excite/unit_id to seq_file interface 2008-04-29 08:06:19 -07:00
bcm47xx [MIPS] BCM47XX: Use new SSB SPROM data structure 2008-02-19 17:01:34 +00:00
boot [MIPS] checkfiles: Fix "need space after that ','" errors. 2007-10-11 23:46:15 +01:00
cobalt [MIPS] add cpu_wait() to machine_halt() 2008-01-29 10:15:00 +00:00
configs [MIPS] Allow setting of the cache attribute at run time. 2008-04-28 17:14:25 +01:00
dec [MIPS] DS1287: Add clockevent driver 2008-04-28 17:14:32 +01:00
emma2rh [MIPS] Kill duplicated setup_irq() for cp0 timer 2007-10-19 18:15:58 +01:00
fw [MIPS] RM: Collected changes 2008-01-29 10:14:59 +00:00
gt64120/wrppmc [MIPS] remove unused mips_machtype 2008-01-29 10:14:55 +00:00
jazz [MIPS] Cleanup pcspeaker platform device registration. 2008-01-29 10:14:57 +00:00
jmr3927 [MIPS] jmr3927: use generic txx9 gpio 2008-04-28 17:14:31 +01:00
kernel mips: use kbuild.h instead of macros in asm-offsets.c 2008-04-29 08:06:29 -07:00
lasat [MIPS] Lasat: Convert pvc_sem semaphore to mutex 2008-01-29 10:15:01 +00:00
lemote/lm2e [MIPS] Fulong: don't reinitialize pci_probe_only to it's default value. 2008-01-29 10:14:59 +00:00
lib iomap: fix 64 bits resources on 32 bits 2008-04-29 08:06:02 -07:00
math-emu [MIPS] replace __inline with inline 2008-04-28 17:14:26 +01:00
mips-boards [MIPS] malta_int.c: make 4 variables static 2008-04-28 17:14:28 +01:00
mipssim [MIPS] Remove TLB sanitation code 2008-04-28 17:14:25 +01:00
mm [MIPS] unexport copy_from_user_page() 2008-04-28 17:14:30 +01:00
nxp/pnx8550 [MIPS] Move arch/mips/philips to arch/mips/nxp 2008-04-28 17:14:26 +01:00
oprofile [MIPS] unexport null_perf_irq() and make it static 2008-04-28 17:14:31 +01:00
pci [MIPS] Alchemy: kill useless #include's, #define's and extern's 2008-04-28 17:14:28 +01:00
pmc-sierra proper extern for late_time_init 2008-04-29 08:06:03 -07:00
sgi-ip22 [MIPS] IP28 support 2008-01-29 10:14:58 +00:00
sgi-ip27 arch: Remove unnecessary inclusions of asm/semaphore.h 2008-04-18 22:14:49 -04:00
sgi-ip32 [MIPS] replace remaining __FUNCTION__ occurrences 2008-04-28 17:14:27 +01:00
sibyte [MIPS] BCM1480: Remove stray function call resulting in infinite recursion 2008-02-19 17:01:31 +00:00
sni [MIPS] RM: Collected changes 2008-01-29 10:14:59 +00:00
tx4927 [MIPS] replace remaining __FUNCTION__ occurrences 2008-04-28 17:14:27 +01:00
tx4938 [MIPS] rbtx4938: minor cleanup 2008-04-28 17:14:32 +01:00
vr41xx serial: add VR41xx SIU setup for serial console 2008-04-28 08:58:30 -07:00
Kconfig [MIPS] DS1287: Add clockevent driver 2008-04-28 17:14:32 +01:00
Kconfig.debug [MIPS] Allow setting of the cache attribute at run time. 2008-04-28 17:14:25 +01:00
Makefile [MIPS] Move arch/mips/philips to arch/mips/nxp 2008-04-28 17:14:26 +01:00