Browse files

Merge branch 'androidsource' android-samsung-3.0-ics-mr1 into nexus-s…


Solved conflict:
  • Loading branch information...
2 parents 1d89be1 + bbcd8d1 commit 2f57f5b2713535a53d8637eb373a8ed06184ac14 @supercurio supercurio committed Dec 18, 2011
Showing 24,619 changed files with 3,287,190 additions and 2,026,755 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
@@ -28,6 +28,7 @@ modules.builtin
@@ -56,6 +57,7 @@ modules.builtin
# stgit generated dirs
@@ -20,16 +20,19 @@ Andreas Herrmann <>
Andrew Morton <>
Andrew Vasquez <>
Andy Adamson <>
+Archit Taneja <>
Arnaud Patard <>
Arnd Bergmann <>
Axel Dyks <>
+Axel Lin <>
Ben Gardner <>
Ben M Cahill <>
Björn Steinbrink <>
Brian Avery <>
Brian King <>
Christoph Hellwig <>
Corey Minyard <>
+Damian Hobson-Garcia <>
David Brownell <>
David Woodhouse <>
Dmitry Eremin-Solenikov <>
@@ -69,6 +72,7 @@ Leonid I Ananiev <>
Linas Vepstas <>
Mark Brown <>
Matthieu CASTET <>
+Mayuresh Janorkar <>
Michael Buesch <>
Michael Buesch <>
Michel Dänzer <>
@@ -77,6 +81,7 @@ Morten Welinder <>
Morten Welinder <>
Morten Welinder <>
Morten Welinder <>
+Mythri P K <>
Nguyen Anh Quynh <>
Paolo 'Blaisorblade' Giarrusso <>
Patrick Mochel <>
@@ -97,6 +102,7 @@ S.Çağlar Onur <>
Simon Kelley <>
Stéphane Witzmann <>
Stephen Hemminger <>
+Sumit Semwal <>
Tejun Heo <>
Thomas Graf <>
Tony Luck <>
@@ -105,3 +111,4 @@ Uwe Kleine-König <>
Uwe Kleine-König <>
Uwe Kleine-König <>
Valdis Kletnieks <>
+Takashi YOSHII <>
@@ -328,7 +328,7 @@ S: Haifa, Israel
N: Johannes Berg
-P: 1024D/9AB78CA5 AD02 0176 4E29 C137 1DF6 08D2 FC44 CF86 9AB7 8CA5
+P: 4096R/7BF9099A C0EB C440 F6DA 091C 884D 8532 E0F3 73F3 7BF9 099A
D: powerpc & 802.11 hacker
N: Stephen R. van den Berg (AKA BuGless)
@@ -518,6 +518,14 @@ N: Zach Brown
D: maestro pci sound
+N: David Brownell
+D: Kernel engineer, mentor, and friend. Maintained USB EHCI and
+D: gadget layers, SPI subsystem, GPIO subsystem, and more than a few
+D: device drivers. His encouragement also helped many engineers get
+D: started working on the Linux kernel. David passed away in early
+D: 2011, and will be greatly missed.
N: Gary Brubaker
D: USB Serial Empeg Empeg-car Mark I/II Driver
@@ -1677,7 +1685,7 @@ W:
D: Assorted VIA x86 support.
D: 2.5 AGPGART overhaul.
D: CPUFREQ maintenance.
-D: Fedora kernel maintainence.
+D: Fedora kernel maintenance.
D: Misc/Other.
S: 314 Littleton Rd, Westford, MA 01886, USA
@@ -2365,8 +2373,6 @@ E:
P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD 841A B6AB 4681 9224 DF01
D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks
-S: R. Brasílio Itiberê, 4270/1010 - Água Verde
-S: 80240-060 - Curitiba - Paraná
S: Brazil
N: Karsten Merker
@@ -2813,8 +2819,8 @@ D: CDROM driver "sonycd535" (Sony CDU-535/531)
N: Stelian Pop
P: 1024D/EDBB6147 7B36 0E07 04BC 11DC A7A0 D3F7 7185 9E7A EDBB 6147
-D: sonypi, meye drivers, mct_u232 usb serial hacks
-S: Paris, France
+D: random kernel hacks
+S: Paimpont, France
N: Pete Popov
@@ -2945,6 +2951,10 @@ S: Kasarmikatu 11 A4
S: 70110 Kuopio
S: Finland
+N: Tobias Ringström
+D: Davicom DM9102(A)/DM9132/DM9801 fast ethernet driver
N: Luca Risolia
P: 1024D/FCE635A4 88E8 F32F 7244 68BA 3958 5D40 99DA 5D2A FCE6 35A4
@@ -3213,7 +3223,7 @@ N: James Simmons
D: Frame buffer device maintainer
-D: input layer developement
+D: input layer development
D: tty/console layer
D: various mipsel devices
S: 115 Carmel Avenue
@@ -3292,7 +3302,7 @@ S: USA
N: Manfred Spraul
-D: Lots of tiny hacks. Larger improvments to SysV IPC msg,
+D: Lots of tiny hacks. Larger improvements to SysV IPC msg,
D: slab, pipe, select.
S: 71701 Schwieberdingen
S: Germany
@@ -3554,12 +3564,12 @@ E:
D: portions of the Linux Security Module (LSM) framework and security modules
N: Petr Vandrovec
D: Small contributions to ncpfs
D: Matrox framebuffer driver
-S: Chudenicka 8
-S: 10200 Prague 10, Hostivar
-S: Czech Republic
+S: 21513 Conradia Ct
+S: Cupertino, CA 95014
N: Thibaut Varene
@@ -3915,6 +3925,10 @@ S: Flandernstrasse 101
S: D-73732 Esslingen
S: Germany
+N: Roman Zippel
+D: AFFS and HFS filesystems, m68k maintainer, new kernel configuration in 2.5
N: Leonard N. Zubkoff
D: BusLogic SCSI driver
@@ -130,8 +130,6 @@ edac.txt
- information on EDAC - Error Detection And Correction
- info on EISA bus support.
- - how Linux v2.2 handles exceptions without verify_area etc.
- dir with docs about the fault injection capabilities infrastructure.
@@ -194,10 +192,6 @@ kernel-docs.txt
- listing of various WWW + books that document kernel internals.
- summary listing of command line / boot prompt args for the kernel.
- - description of the kernel key request service.
- - description of the kernel key retention service.
- info of the kobject infrastructure of the Linux kernel.
@@ -208,8 +202,8 @@ laptops/
- directory with laptop related info and laptop driver documentation.
- a brief description of LDM (Windows Dynamic Disks).
- - documents LED handling under Linux.
+ - directory with info about LED handling under Linux.
- semantics and behavior of local atomic operations.
@@ -234,6 +228,8 @@ memory.txt
- info on typical Linux memory problems.
- directory with info about Linux on MIPS architecture.
+ - directory with info about the MMC subsystem
- how to execute Mono-based .NET binaries with the help of BINFMT_MISC.
@@ -294,6 +290,8 @@ scheduler/
- directory with info on the scheduler.
- directory with info on Linux scsi support.
+ - directory that contains security-related info
- directory with info on the low level serial API.
@@ -328,10 +326,6 @@ sysrq.txt
- info on the magic SysRq key.
- directory with info on telephony (e.g. voice over IP) support.
- - info on time interpolators.
- - directory with information about User Mode Linux.
- info on the Unicode character/font mapping used in Linux.
@@ -346,8 +340,6 @@ vm/
- directory with info on the Linux vm code.
- Why the "volatile" type class should not be used
- - guide to running Linux on the Voyager architecture.
- directory with documents regarding the 1-wire (w1) subsystem.
@@ -1,9 +0,0 @@
-What: dv1394 (a.k.a. "OHCI-DV I/O support" for FireWire)
- New application development should use raw1394 + userspace libraries
- instead, notably libiec61883 which is functionally equivalent.
- ffmpeg/libavformat (used by a variety of media players)
- dvgrab v1.x (replaced by dvgrab2 on top of raw1394 and resp. libraries)
@@ -1,11 +0,0 @@
-What: /sys/o2cb symlink
-Date: Dec 2005
-KernelVersion: 2.6.16
-Description: This is a symlink: /sys/o2cb to /sys/fs/o2cb. The symlink will
- be removed when new versions of ocfs2-tools which know to look
- in /sys/fs/o2cb are sufficiently prevalent. Don't code new
- software to look here, it should try /sys/fs/o2cb instead.
- See Documentation/ABI/stable/o2cb for more information on usage.
-Users: ocfs2-tools. It's sufficient to mail proposed changes to
@@ -0,0 +1,22 @@
+What: /proc/<pid>/oom_adj
+When: August 2012
+Why: /proc/<pid>/oom_adj allows userspace to influence the oom killer's
+ badness heuristic used to determine which task to kill when the kernel
+ is out of memory.
+ The badness heuristic has since been rewritten since the introduction of
+ this tunable such that its meaning is deprecated. The value was
+ implemented as a bitshift on a score generated by the badness()
+ function that did not have any precise units of measure. With the
+ rewrite, the score is given as a proportion of available memory to the
+ task allocating pages, so using a bitshift which grows the score
+ exponentially is, thus, impossible to tune with fine granularity.
+ A much more powerful interface, /proc/<pid>/oom_score_adj, was
+ introduced with the oom killer rewrite that allows users to increase or
+ decrease the badness() score linearly. This interface will replace
+ /proc/<pid>/oom_adj.
+ A warning will be emitted to the kernel log if an application uses this
+ deprecated interface. After it is printed once, future warnings will be
+ suppressed until the kernel is rebooted.
@@ -0,0 +1,10 @@
+What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/startup_profile
+Date: October 2010
+Contact: Stefan Achatz <>
+Description: The integer value of this attribute ranges from 0-4.
+ When read, this attribute returns the number of the actual
+ profile. This value is persistent, so its equivalent to the
+ profile that's active when the mouse is powered on next time.
+ When written, this file sets the number of the startup profile
+ and the mouse activates this profile immediately.
+ Please use actual_profile, it does the same thing.
@@ -0,0 +1,14 @@
+What: dv1394 (a.k.a. "OHCI-DV I/O support" for FireWire)
+Date: May 2010 (scheduled), finally removed in kernel v2.6.37
+ /dev/dv1394/* were character device files, one for each FireWire
+ controller and for NTSC and PAL respectively, from which DV data
+ could be received by read() or transmitted by write(). A few
+ ioctl()s allowed limited control.
+ This special-purpose interface has been superseded by libraw1394 +
+ libiec61883 which are functionally equivalent, support HDV, and
+ transparently work on top of the newer firewire kernel drivers.
+ ffmpeg/libavformat (if configured for DV1394)
@@ -0,0 +1,10 @@
+What: /sys/o2cb symlink
+Date: May 2011
+KernelVersion: 2.6.40
+Description: This is a symlink: /sys/o2cb to /sys/fs/o2cb. The symlink is
+ removed when new versions of ocfs2-tools which know to look
+ in /sys/fs/o2cb are sufficiently prevalent. Don't code new
+ software to look here, it should try /sys/fs/o2cb instead.
+Users: ocfs2-tools. It's sufficient to mail proposed changes to
@@ -0,0 +1,15 @@
+What: raw1394 (a.k.a. "Raw IEEE1394 I/O support" for FireWire)
+Date: May 2010 (scheduled), finally removed in kernel v2.6.37
+ /dev/raw1394 was a character device file that allowed low-level
+ access to FireWire buses. Its major drawbacks were its inability
+ to implement sensible device security policies, and its low level
+ of abstraction that required userspace clients do duplicate much
+ of the kernel's ieee1394 core functionality.
+ Replaced by /dev/fw*, i.e. the <linux/firewire-cdev.h> ABI of
+ firewire-core.
+ libraw1394 (works with firewire-cdev too, transparent to library ABI
+ users)
@@ -1,16 +0,0 @@
-What: legacy isochronous ABI of raw1394 (1st generation iso ABI)
-Date: June 2007 (scheduled), removed in kernel v2.6.23
- The two request types RAW1394_REQ_ISO_SEND, RAW1394_REQ_ISO_LISTEN have
- been deprecated for quite some time. They are very inefficient as they
- come with high interrupt load and several layers of callbacks for each
- packet. Because of these deficiencies, the video1394 and dv1394 drivers
- and the 3rd-generation isochronous ABI in raw1394 (rawiso) were created.
- libraw1394 users via the long deprecated API raw1394_iso_write,
- raw1394_start_iso_write, raw1394_start_iso_rcv, raw1394_stop_iso_rcv
- libdc1394, which optionally uses these old libraw1394 calls
- alternatively to the more efficient video1394 ABI
@@ -0,0 +1,16 @@
+What: video1394 (a.k.a. "OHCI-1394 Video support" for FireWire)
+Date: May 2010 (scheduled), finally removed in kernel v2.6.37
+ /dev/video1394/* were character device files, one for each FireWire
+ controller, which were used for isochronous I/O. It was added as an
+ alternative to raw1394's isochronous I/O functionality which had
+ performance issues in its first generation. Any video1394 user had
+ to use raw1394 + libraw1394 too because video1394 did not provide
+ asynchronous I/O for device discovery and configuration.
+ Replaced by /dev/fw*, i.e. the <linux/firewire-cdev.h> ABI of
+ firewire-core.
+ libdc1394 (works with firewire-cdev too, transparent to library ABI
+ users)
@@ -34,3 +34,23 @@ Contact: Richard Purdie <>
Maximum brightness for <backlight>.
Users: HAL
+What: /sys/class/backlight/<backlight>/type
+Date: September 2010
+KernelVersion: 2.6.37
+Contact: Matthew Garrett <>
+ The type of interface controlled by <backlight>.
+ "firmware": The driver uses a standard firmware interface
+ "platform": The driver uses a platform-specific interface
+ "raw": The driver controls hardware registers directly
+ In the general case, when multiple backlight
+ interfaces are available for a single device, firmware
+ control should be preferred to platform control should
+ be preferred to raw control. Using a firmware
+ interface reduces the probability of confusion with
+ the hardware and the OS independently updating the
+ backlight state. Platform interfaces are mostly a
+ holdover from pre-standardisation of firmware
+ interfaces.
Oops, something went wrong.

0 comments on commit 2f57f5b

Please sign in to comment.