Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdf242ee authored by Dave Airlie's avatar Dave Airlie Committed by Dave Airlie
Browse files

Merge ../linux-2.6/

parents 836cf046 b0825488

CREDITS

+3 −3
Original line number Diff line number Diff line
@@ -1624,10 +1624,10 @@ E: ajoshi@shell.unixbox.com 
D: fbdev hacking



N: Jesper Juhl

E: juhl-lkml@dif.dk

D: Various small janitor fixes, cleanups etc.

E: jesper.juhl@gmail.com

D: Various fixes, cleanups and minor features.

S: Lemnosvej 1, 3.tv

S: 2300 Copenhagen S

S: 2300 Copenhagen S.

S: Denmark



N: Jozsef Kadlecsik

Documentation/Changes

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ o isdn4k-utils 3.1pre1 # isdnctrl 2>&1|grep version 
o  nfs-utils              1.0.5                   # showmount --version

o  procps                 3.2.0                   # ps --version

o  oprofile               0.9                     # oprofiled --version

o  udev                   058                     # udevinfo -V



Kernel compilation

==================

Documentation/acpi-hotkey.txt

0 → 100644
+35 −0
Original line number Diff line number Diff line 
driver/acpi/hotkey.c implement:

1. /proc/acpi/hotkey/event_config 

(event based hotkey or event config interface):

a. add a  event based hotkey(event) : 

echo "0:bus::action:method:num:num" > event_config



b. delete a event based hotkey(event): 

echo "1:::::num:num" > event_config



c.  modify a event based hotkey(event):    

echo "2:bus::action:method:num:num" > event_config



2. /proc/acpi/hotkey/poll_config 

(polling based hotkey or event config interface):

a.add a polling based hotkey(event) : 	

echo "0:bus:method:action:method:num" > poll_config

this adding command will create a proc file 

/proc/acpi/hotkey/method, which is used to get 

result of polling.



b.delete a polling based hotkey(event): 	

echo "1:::::num" > event_config



c.modify a polling based hotkey(event):    

echo "2:bus:method:action:method:num" > poll_config



3./proc/acpi/hotkey/action 

(interface to call aml method associated with a 

specific hotkey(event))

echo "event_num:event_type:event_argument" > 

	/proc/acpi/hotkey/action.

The result of the execution of this aml method is 

attached to /proc/acpi/hotkey/poll_method, which is dnyamically

created.  Please use command "cat /proc/acpi/hotkey/polling_method" 

to retrieve it.

Documentation/dontdiff

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ COPYING 
CREDITS

CVS

ChangeSet

Image

Kerntypes

MODS.txt

Module.symvers
@@ -103,6 +104,7 @@ logo_*.c 
logo_*_clut224.c

logo_*_mono.c

lxdialog

mach-types.h

make_times_h

map

maui_boot.h

Documentation/feature-removal-schedule.txt

+2 −2
Original line number Diff line number Diff line
@@ -103,11 +103,11 @@ Who: Jody McIntyre <scjody@steamballoon.com> 
---------------------------



What:	register_serial/unregister_serial

When:	December 2005

When:	September 2005

Why:	This interface does not allow serial ports to be registered against

	a struct device, and as such does not allow correct power management

	of such ports.  8250-based ports should use serial8250_register_port

	and serial8250_unregister_port instead.

	and serial8250_unregister_port, or platform devices instead.

Who:	Russell King <rmk@arm.linux.org.uk>



---------------------------