---

yaml
---
r: 249907
b: refs/heads/master
c: df4c144
h: refs/heads/master
i:
  249905: 5215ec2
  249903: cee5416
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5039935ac685b3b9b8c13fbc33cac8643dee32e
+refs/heads/master: df4c144f7514071a54a46eaa5a9e16299c056e29

trunk/CREDITS

@@ -328,7 +328,7 @@ S: Haifa, Israel
 N: Johannes Berg
 E: johannes@sipsolutions.net
 W: http://johannes.sipsolutions.net/
-P: 4096R/7BF9099A C0EB C440 F6DA 091C 884D  8532 E0F3 73F3 7BF9 099A
+P: 1024D/9AB78CA5 AD02 0176 4E29 C137 1DF6 08D2 FC44 CF86 9AB7 8CA5
 D: powerpc & 802.11 hacker
 
 N: Stephen R. van den Berg (AKA BuGless)

trunk/Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus

@@ -1,12 +1,9 @@
 What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/actual_profile
 Date:		October 2010
 Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
-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.
+Description:	When read, this file returns the number of the actual profile in
+		range 0-4.
+		This file is readonly.
 Users:		http://roccat.sourceforge.net
 
 What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/firmware_version
@@ -92,6 +89,16 @@ Description:	The mouse has a tracking- and a distance-control-unit. These
 		This file is writeonly.
 Users:		http://roccat.sourceforge.net
 
+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 <erazor_de@users.sourceforge.net>
+Description:	The integer value of this attribute ranges from 0-4.
+                When read, this attribute returns the number of the profile
+                that's active when the mouse is powered on.
+		When written, this file sets the number of the startup profile
+		and the mouse activates this profile immediately.
+Users:		http://roccat.sourceforge.net
+
 What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/tcu
 Date:		October 2010
 Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

trunk/Documentation/HOWTO

@@ -209,7 +209,7 @@ tools.  One such tool that is particularly recommended is the Linux
 Cross-Reference project, which is able to present source code in a
 self-referential, indexed webpage format. An excellent up-to-date
 repository of the kernel code may be found at:
-	http://lxr.linux.no/+trees
+	http://users.sosdg.org/~qiyong/lxr/
 
 
 The development process

trunk/Documentation/SubmittingPatches

@@ -714,11 +714,10 @@ Jeff Garzik, "Linux kernel patch submission format".
   <http://linux.yyz.us/patch-format.html>
 
 Greg Kroah-Hartman, "How to piss off a kernel subsystem maintainer".
-  <http://www.kroah.com/log/linux/maintainer.html>
-  <http://www.kroah.com/log/linux/maintainer-02.html>
-  <http://www.kroah.com/log/linux/maintainer-03.html>
-  <http://www.kroah.com/log/linux/maintainer-04.html>
-  <http://www.kroah.com/log/linux/maintainer-05.html>
+  <http://www.kroah.com/log/2005/03/31/>
+  <http://www.kroah.com/log/2005/07/08/>
+  <http://www.kroah.com/log/2005/10/19/>
+  <http://www.kroah.com/log/2006/01/11/>
 
 NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!
   <http://marc.theaimsgroup.com/?l=linux-kernel&m=112112749912944&w=2>

trunk/Documentation/devicetree/bindings/powerpc/nintendo/wii.txt

@@ -127,7 +127,7 @@ Nintendo Wii device tree
    - reg : should contain the SDHCI registers location and length
    - interrupts : should contain the SDHCI interrupt
 
-1.j) The Inter-Processor Communication (IPC) node
+1.j) The Inter-Processsor Communication (IPC) node
 
   Represent the Inter-Processor Communication interface. This interface
   enables communications between the Broadway and the Starlet processors.

trunk/Documentation/dontdiff

@@ -1,17 +1,13 @@
 *.a
 *.aux
 *.bin
-*.bz2
-*.cis
 *.cpio
 *.csp
 *.dsp
 *.dvi
 *.elf
 *.eps
 *.fw
-*.gcno
-*.gcov
 *.gen.S
 *.gif
 *.grep
@@ -23,20 +19,14 @@
 *.ko
 *.log
 *.lst
-*.lzma
-*.lzo
-*.mo
 *.moc
 *.mod.c
 *.o
 *.o.*
-*.order
 *.orig
 *.out
-*.patch
 *.pdf
 *.png
-*.pot
 *.ps
 *.rej
 *.s
@@ -49,22 +39,16 @@
 *.tex
 *.ver
 *.xml
-*.xz
 *_MODULES
 *_vga16.c
 *~
-\#*#
 *.9
+*.9.gz
 .*
-.*.d
 .mm
 53c700_d.h
 CVS
 ChangeSet
-GPATH
-GRTAGS
-GSYMS
-GTAGS
 Image
 Kerntypes
 Module.markers
@@ -73,14 +57,15 @@ PENDING
 SCCS
 System.map*
 TAGS
-aconf
-af_names.h
 aic7*reg.h*
 aic7*reg_print.c*
 aic7*seq.h*
 aicasm
 aicdb.h*
-altivec*.c
+altivec1.c
+altivec2.c
+altivec4.c
+altivec8.c
 asm-offsets.h
 asm_offsets.h
 autoconf.h*
@@ -95,7 +80,6 @@ btfixupprep
 build
 bvmlinux
 bzImage*
-capability_names.h
 capflags.c
 classlist.h*
 comp*.log
@@ -104,18 +88,15 @@ conf
 config
 config-*
 config_data.h*
-config.mak
-config.mak.autogen
+config_data.gz*
 conmakehash
 consolemap_deftbl.c*
 cpustr.h
 crc32table.h*
 cscope.*
 defkeymap.c
 devlist.h*
-dnotify_test
 docproc
-dslm
 elf2ecoff
 elfconfig.h*
 evergreen_reg_safe.h
@@ -124,20 +105,18 @@ flask.h
 fore200e_mkfirm
 fore200e_pca_fw.c*
 gconf
-gconf.glade.h
 gen-devlist
 gen_crc32table
 gen_init_cpio
 generated
 genheaders
 genksyms
 *_gray256.c
-hpet_example
-hugepage-mmap
-hugepage-shm
 ihex2fw
 ikconfig.h*
 inat-tables.c
+initramfs_data.cpio
+initramfs_data.cpio.gz
 initramfs_list
 int16.c
 int1.c
@@ -154,19 +133,15 @@ kxgettext
 lkc_defs.h
 lex.c
 lex.*.c
-linux
 logo_*.c
 logo_*_clut224.c
 logo_*_mono.c
 lxdialog
-mach
 mach-types
 mach-types.h
 machtypes.h
 map
-map_hugetlb
 maui_boot.h
-media
 mconf
 miboot*
 mk_elfconfig
@@ -175,29 +150,23 @@ mkbugboot
 mkcpustr
 mkdep
 mkprep
-mkregtable
 mktables
 mktree
 modpost
 modules.builtin
 modules.order
 modversions.h*
-nconf
 ncscope.*
 offset.h
 offsets.h
 oui.c*
-page-types
 parse.c
 parse.h
 patches*
 pca200e.bin
 pca200e_ecd.bin2
-perf.data
-perf.data.old
-perf-archive
+piggy.gz
 piggyback
-piggy.gzip
 piggy.S
 pnmtologo
 ppc_defs.h*
@@ -208,9 +177,10 @@ r200_reg_safe.h
 r300_reg_safe.h
 r420_reg_safe.h
 r600_reg_safe.h
-recordmcount
+raid6altivec*.c
+raid6int*.c
+raid6tables.c
 relocs
-rlim_names.h
 rn50_reg_safe.h
 rs600_reg_safe.h
 rv515_reg_safe.h
@@ -224,7 +194,6 @@ split-include
 syscalltab.h
 tables.c
 tags
-test_get_len
 tftpboot.img
 timeconst.h
 times.h*
@@ -241,13 +210,10 @@ vdso32.so.dbg
 vdso64.lds
 vdso64.so.dbg
 version.h*
-vmImage
 vmlinux
 vmlinux-*
 vmlinux.aout
-vmlinux.bin.all
 vmlinux.lds
-vmlinuz
 voffset.h
 vsyscall.lds
 vsyscall_32.lds

trunk/Documentation/feature-removal-schedule.txt

@@ -215,7 +215,7 @@ Who:	Zhang Rui <rui.zhang@intel.com>
 What:	CONFIG_ACPI_PROCFS_POWER
 When:	2.6.39
 Why:	sysfs I/F for ACPI power devices, including AC and Battery,
-        has been working in upstream kernel since 2.6.24, Sep 2007.
+        has been working in upstream kenrel since 2.6.24, Sep 2007.
 	In 2.6.37, we make the sysfs I/F always built in and this option
 	disabled by default.
 	Remove this option and the ACPI power procfs interface in 2.6.39.