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

Commit 65d76f36 authored by David Vrabel's avatar David Vrabel
Browse files

Merge branch 'master' of...

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
parents dba0a918 ed313489
Loading
Loading
Loading
Loading
+8 −3
Original line number Diff line number Diff line
@@ -294,7 +294,9 @@ and is between 256 and 4096 characters. It is defined in the file
			Possible values are:
			isolate - enable device isolation (each device, as far
			          as possible, will get its own protection
			          domain)
			          domain) [default]
			share - put every device behind one IOMMU into the
				same protection domain
			fullflush - enable flushing of IO/TLB entries when
				    they are unmapped. Otherwise they are
				    flushed before they will be reused, which
@@ -1193,8 +1195,8 @@ and is between 256 and 4096 characters. It is defined in the file
			it is equivalent to "nosmp", which also disables
			the IO APIC.

	max_addr=[KMG]	[KNL,BOOT,ia64] All physical memory greater than or
			equal to this physical address is ignored.
	max_addr=nn[KMG]	[KNL,BOOT,ia64] All physical memory greater than
			or equal to this physical address is ignored.

	max_luns=	[SCSI] Maximum number of LUNs to probe.
			Should be between 1 and 2^32-1.
@@ -1294,6 +1296,9 @@ and is between 256 and 4096 characters. It is defined in the file

	mga=		[HW,DRM]

	min_addr=nn[KMG]	[KNL,BOOT,ia64] All physical memory below this
			physical address is ignored.

	mminit_loglevel=
			[KNL] When CONFIG_DEBUG_MEMORY_INIT is set, this
			parameter allows control of the logging verbosity for
+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ Letting the PHY Abstraction Layer do Everything
   static void adjust_link(struct net_device *dev);
 
 Next, you need to know the device name of the PHY connected to this device. 
 The name will look something like, "phy0:0", where the first number is the
 The name will look something like, "0:00", where the first number is the
 bus id, and the second is the PHY's address on that bus.  Typically,
 the bus is responsible for making its ID unique.
 
+1 −1
Original line number Diff line number Diff line
@@ -1809,7 +1809,7 @@ S: Maintained

FTRACE
P:	Steven Rostedt
M:	srostedt@redhat.com
M:	rostedt@goodmis.org
S:	Maintained

FUJITSU FR-V (FRV) PORT
+1 −1
Original line number Diff line number Diff line
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 28
EXTRAVERSION = -rc5
EXTRAVERSION = -rc6
NAME = Killer Bat of Doom

# *DOCUMENTATION*
+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@
#define LCD_CONN_TYPE(_x)	((_x) & 0x0f)
#define LCD_CONN_WIDTH(_x)	(((_x) >> 4) & 0x1f)

#define LCD_TYPE_MASK		0xf
#define LCD_TYPE_UNKNOWN	0
#define LCD_TYPE_MONO_STN	1
#define LCD_TYPE_MONO_DSTN	2
Loading