---

yaml --- r: 259169 b: refs/heads/master c: 112d1fe h: refs/heads/master i: 259167: f5f0c05 v: v3
git-mirror · Jul 12, 2011 · cd51e92 · cd51e92
1 parent 69700fb
commit cd51e92
Show file tree

Hide file tree

Showing 52 changed files with 1,311 additions and 3,995 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7723f0eaf53d51ee54374116b25ac33e0be8542
+refs/heads/master: 112d1fe9f7715db423ffeec5ac1beccff6093dc4
diff --git a/trunk/Documentation/ioctl/ioctl-number.txt b/trunk/Documentation/ioctl/ioctl-number.txt
@@ -301,7 +301,6 @@ Code  Seq#(hex)	Include File		Comments
 					<mailto:rusty@rustcorp.com.au>
 0xAE	all	linux/kvm.h		Kernel-based Virtual Machine
 					<mailto:kvm@vger.kernel.org>
-0xAF	00-1F	linux/fsl_hypervisor.h	Freescale hypervisor
 0xB0	all	RATIO devices		in development:
 					<mailto:vgo@ratio.de>
 0xB1	00-1F	PPPoX			<mailto:mostrows@styx.uwaterloo.ca>

diff --git a/trunk/arch/powerpc/boot/dts/p1022ds.dts b/trunk/arch/powerpc/boot/dts/p1022ds.dts
@@ -412,6 +412,7 @@
 			fsl,magic-packet;
 			fsl,wake-on-filer;
 			local-mac-address = [ 00 00 00 00 00 00 ];
+			fixed-link = <1 1 1000 0 0>;
 			phy-handle = <&phy0>;
 			phy-connection-type = "rgmii-id";
 			queue-group@0{
@@ -438,6 +439,7 @@
 			fsl,num_rx_queues = <0x8>;
 			fsl,num_tx_queues = <0x8>;
 			local-mac-address = [ 00 00 00 00 00 00 ];
+			fixed-link = <1 1 1000 0 0>;
 			phy-handle = <&phy1>;
 			phy-connection-type = "rgmii-id";
 			queue-group@0{

diff --git a/trunk/arch/powerpc/boot/dts/p2040rdb.dts b/trunk/arch/powerpc/boot/dts/p2040rdb.dts