)]}' { "log": [ { "commit": "8a3bdfe6cd841880a5d849c40f90093b3817f6e0", "tree": "9a8fed219723382a4de41f29c99b4ab1735a04d6", "parents": [ "9bd14a839d2ec703c56593a7209f2310c16d6478" ], "author": { "name": "Thomas Gerlach", "email": "t.m.gerlach@freenet.de", "time": "Fri Apr 23 13:17:50 2010 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 24 11:31:24 2010 -0700" }, "message": "drivers/video/efifb.c: support framebuffer for NVIDIA 9400M in MacBook Pro 5,1\n\nDescription of patch:\n---------------------\n\nThis is a patch for the EFI framebuffer driver to enable the framebuffer\nof the NVIDIA 9400M as found in MacBook Pro (MBP) 5,1 and up. The\nframebuffer of the NVIDIA graphic cards are located at the following\naddresses in memory:\n\n9400M: 0xC0010000\n9600M GT: 0xB0030000\n\nThe patch delivered right here only provides the memory location of the\nframebuffer of the 9400M device. The 9600M GT is not covered. It is\nassumed that the 9400M is used when powered up the MBP.\n\nThe information which device is currently powered and in use is stored in\nthe 64 bytes large EFI variable \"gpu-power-prefs\". More specifically,\nbyte 0x3B indicates whether 9600M GT (0x00) or 9400M (0x01) is online.\n\nThe PCI bus IDs are the following:\n9400M: PCI 03:00:00\n9600M GT: PCI 02:00:00\n\nThe EFI variables can be easily read-out and manipulated with \"rEFIt\", an\nMBP specific bootloader tool. For more information on how handle rEFIt\nand EFI variables please consult \"http://refit.sourceforge.net\" and\n\"http://ubuntuforums.org/archive/index.php/t-1076879.html\".\n\nIMPORTANT NOTE: The information on how to activate the 9400M device given\nat \"ubuntuforums.org\" is not correct, since it states\n\ngpu-power-prefs[0x3B] \u003d 0x00 -\u003e 9400M (PCI 02:00:00)\ngpu-power-prefs[0x3B] \u003d 0x01 -\u003e 9600M GT (PCI 03:00:00)\n\nActually, the assignment of the values and the PCI bus IDs are swapped.\n\nSuggestions:\n------------\n\nTo cover framebuffers of both 9400M and 9600M GT, I would suggest to\nimplement a conditional on \"gpu-power-prefs\". Depending on the value of\nbyte 0x3B, the according framebuffer is selected. However, this requires\nkernel access to the EFI variables.\n\n[akpm@linux-foundation.org: rename optname, per Peter Jones]\nSigned-off-by: Thomas Gerlach \u003ct.m.gerlach@freenet.de\u003e\nAcked-by: Peter Jones \u003cpjones@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "da258016293f5e82b36db67ac3db3931a4fbbc4d", "tree": "2462a042f7b52dbf63b7ac841d39a81478b1d723", "parents": [ "a71dc148c2674bbb5988ea924702137993b3305a" ], "author": { "name": "Alexander Shishkin", "email": "virtuoso@slind.org", "time": "Tue Apr 06 14:34:57 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 07 08:38:04 2010 -0700" }, "message": "mb862xxfb: update Valentin\u0027s email address\n\nSince Valentin\u0027s email address @siemens.com is no longer valid, it\u0027s time\nto change it to the one that actually works so that I don\u0027t have to\nmanually forward patches against mb862xx to him every time.\n\nSigned-off-by: Alexander Shishkin \u003cvirtuoso@slind.org\u003e\nAcked-by: Valentin Sitdikov \u003cv.sitdikov@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a71dc148c2674bbb5988ea924702137993b3305a", "tree": "06d44f94c400af54526226641d1e5a909a8c79e8", "parents": [ "d6da1a5abc2bf3a06a5bda08e0f6833409234666" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Tue Apr 06 14:34:57 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 07 08:38:03 2010 -0700" }, "message": "mb862xxfb: fix acceleration module license\n\nmb862xxfb_accel built as a separate module, but it does not have a\nMODULE_LICENSE, so it taints the kernel. Add a MODULE_LICENSE to it (same\nas mb862xxfb license).\n\nmb862xxfb_accel: module license \u0027unspecified\u0027 taints kernel.\n\nOr should mb862xxfb_accel be built into the mb862xxfb binary file instead?\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nAcked-by: Alexander Shishkin \u003cvirtuoso@slind.org\u003e\nCc: Valentin Sitdikov \u003cv.sitdikov@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "12765517d9dbb477a2432375938f1eb5bdbcb532", "tree": "5c0e4002378fe3b65e20ea4959276d22b0a22911", "parents": [ "975f8c5653acba461229e671202113da69b87be1" ], "author": { "name": "Wolfram Sang", "email": "w.sang@pengutronix.de", "time": "Tue Apr 06 14:34:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 07 08:38:03 2010 -0700" }, "message": "device_attributes: add sysfs_attr_init() for dynamic attributes\n\nMade necessary by 6992f5334995af474c2b58d010d08bc597f0f2fe (\"sysfs: Use\none lockdep class per sysfs attribute\").\n\nPrevents further \"key xxx not in .data\" bug-reports. Although some\nattributes could probably be converted to static ones, this is left for\npeople having hardware to test.\n\nFound by this semantic patch:\n\n@ init @\ntype T;\nidentifier A;\n@@\n\n T {\n ...\n struct device_attribute A;\n ...\n };\n\n@ main extends init @\nexpression E;\nstatement S;\nidentifier err;\nT *name;\n@@\n\n ... when !\u003d sysfs_attr_init(\u0026name-\u003eA.attr);\n(\n+ sysfs_attr_init(\u0026name-\u003eA.attr);\n if (device_create_file(E, \u0026name-\u003eA))\n S\n|\n+ sysfs_attr_init(\u0026name-\u003eA.attr);\n err \u003d device_create_file(E, \u0026name-\u003eA);\n)\n\nWhile reviewing, I put the initialization to apropriate places.\n\nSigned-off-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nCc: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nCc: Greg KH \u003cgregkh@suse.de\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nCc: Mike Isely \u003cisely@pobox.com\u003e\nCc: Mauro Carvalho Chehab \u003cmchehab@infradead.org\u003e\nCc: Sujith Thomas \u003csujith.thomas@intel.com\u003e\nCc: Matthew Garrett \u003cmjg@redhat.com\u003e\nCc: Len Brown \u003clen.brown@intel.com\u003e\nCc: Krzysztof Helt \u003ckrzysztof.h1@wp.pl\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fc95c6d9b4433525ed9484089b6e092f3516a92b", "tree": "fa98b2e6238c73a6ebdbb59b0fb8107dfc0369fe", "parents": [ "530cd330dc3865e3107304a6e84fdc332aa72f7d" ], "author": { "name": "Jan Beulich", "email": "JBeulich@novell.com", "time": "Tue Apr 06 14:34:44 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 07 08:38:02 2010 -0700" }, "message": "vesafb: use platform_driver_probe() instead of platform_driver_register()\n\nCommit c2e13037e6794bd0d9de3f9ecabf5615f15c160b (\"platform-drivers: move\nprobe to .devinit.text in drivers/video\") introduced a huge amount of\nsection mismatch warnings in vesafb code. Rather than converting all of\nthe annotations, do the obvious and revert the __init -\u003e __devinit change,\nand use the recommended (in that patch) alternative to calling\nplatform_driver_register(): vesafb depends on information obtained from by\nkernel at boot time, cannot be a module, and no post-boot devices can ever\nshow up.\n\nSigned-off-by: Jan Beulich \u003cjbeulich@novell.com\u003e\nCc: Greg KH \u003cgreg@kroah.com\u003e\nAcked-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "336f5899d287f06d8329e208fc14ce50f7ec9698", "tree": "9b762d450d5eb248a6ff8317badb7e223d93ed58", "parents": [ "a4ab2773205e8b94c18625455f85e3b6bb9d7ad6", "db217dece3003df0841bacf9556b5c06aa097dae" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Apr 05 11:37:28 2010 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Apr 05 11:37:28 2010 +0900" }, "message": "Merge branch \u0027master\u0027 into export-slabh\n" }, { "commit": "bdd32ce95f79fb5cc964cd789d7ae4500bba7c6f", "tree": "506a7deeb0e91f8ed8b582a0596303a804a8d779", "parents": [ "954fbc8985328a3b59b5881243d3aa04a8f8da7c" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 04 01:12:50 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Apr 04 01:12:50 2010 -0700" }, "message": "sunxvr500: Ignore secondary output PCI devices.\n\nThese just represent the secondary and further heads attached to the\ncard, and they have different sets of PCI bar registers to map.\n\nSo don\u0027t try to drive them in the main driver.\n\nReported-by: Frans van Berckel \u003cfberckel@xs4all.nl\u003e\nTested-by: Frans van Berckel \u003cfberckel@xs4all.nl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5a0e3ad6af8660be21ca98a971cd00f331318c05", "tree": "5bfb7be11a03176a87296a43ac6647975c00a1d1", "parents": [ "ed391f4ebf8f701d3566423ce8f17e614cde9806" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Mar 24 17:04:11 2010 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Mar 30 22:02:32 2010 +0900" }, "message": "include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h\n\npercpu.h is included by sched.h and module.h and thus ends up being\nincluded when building most .c files. percpu.h includes slab.h which\nin turn includes gfp.h making everything defined by the two files\nuniversally available and complicating inclusion dependencies.\n\npercpu.h -\u003e slab.h dependency is about to be removed. Prepare for\nthis change by updating users of gfp and slab facilities include those\nheaders directly instead of assuming availability. As this conversion\nneeds to touch large number of source files, the following script is\nused as the basis of conversion.\n\n http://userweb.kernel.org/~tj/misc/slabh-sweep.py\n\nThe script does the followings.\n\n* Scan files for gfp and slab usages and update includes such that\n only the necessary includes are there. ie. if only gfp is used,\n gfp.h, if slab is used, slab.h.\n\n* When the script inserts a new include, it looks at the include\n blocks and try to put the new include such that its order conforms\n to its surrounding. It\u0027s put in the include block which contains\n core kernel includes, in the same order that the rest are ordered -\n alphabetical, Christmas tree, rev-Xmas-tree or at the end if there\n doesn\u0027t seem to be any matching order.\n\n* If the script can\u0027t find a place to put a new include (mostly\n because the file doesn\u0027t have fitting include block), it prints out\n an error message indicating which .h file needs to be added to the\n file.\n\nThe conversion was done in the following steps.\n\n1. The initial automatic conversion of all .c files updated slightly\n over 4000 files, deleting around 700 includes and adding ~480 gfp.h\n and ~3000 slab.h inclusions. The script emitted errors for ~400\n files.\n\n2. Each error was manually checked. Some didn\u0027t need the inclusion,\n some needed manual addition while adding it to implementation .h or\n embedding .c file was more appropriate for others. This step added\n inclusions to around 150 files.\n\n3. The script was run again and the output was compared to the edits\n from #2 to make sure no file was left behind.\n\n4. Several build tests were done and a couple of problems were fixed.\n e.g. lib/decompress_*.c used malloc/free() wrappers around slab\n APIs requiring slab.h to be added manually.\n\n5. The script was run on all .h files but without automatically\n editing them as sprinkling gfp.h and slab.h inclusions around .h\n files could easily lead to inclusion dependency hell. Most gfp.h\n inclusion directives were ignored as stuff from gfp.h was usually\n wildly available and often used in preprocessor macros. Each\n slab.h inclusion directive was examined and added manually as\n necessary.\n\n6. percpu.h was updated not to include slab.h.\n\n7. Build test were done on the following configurations and failures\n were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my\n distributed build env didn\u0027t work with gcov compiles) and a few\n more options had to be turned off depending on archs to make things\n build (like ipr on powerpc/64 which failed due to missing writeq).\n\n * x86 and x86_64 UP and SMP allmodconfig and a custom test config.\n * powerpc and powerpc64 SMP allmodconfig\n * sparc and sparc64 SMP allmodconfig\n * ia64 SMP allmodconfig\n * s390 SMP allmodconfig\n * alpha SMP allmodconfig\n * um on x86_64 SMP allmodconfig\n\n8. percpu.h modifications were reverted so that it could be applied as\n a separate patch and serve as bisection point.\n\nGiven the fact that I had only a couple of failures from tests on step\n6, I\u0027m fairly confident about the coverage of this conversion patch.\nIf there is a breakage, it\u0027s likely to be something in one of the arch\nheaders which should be easily discoverable easily on most builds of\nthe specific arch.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nGuess-its-ok-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Lee Schermerhorn \u003cLee.Schermerhorn@hp.com\u003e\n" }, { "commit": "01e77706cdde7c0b47e5ca1f4284a795504c7c40", "tree": "07d2574b13974669a6fcfccd276630754724553f", "parents": [ "1ff31056fb044a47cdda462bdef0dcacefbf6856", "8871d54b5e1558bd59baad02eb7a80f86d49f4a1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 24 16:52:15 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 24 16:52:15 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://gitorious.org/linux-omap-dss2/linux\n\n* \u0027for-linus\u0027 of git://gitorious.org/linux-omap-dss2/linux:\n OMAP: DSS2: panel-generic: re-implement mode changing\n OMAP: DSS2: initialize dss clk sources properly\n OMAP: DSS2: VRAM: Fix early_param for vram\n" }, { "commit": "1ff31056fb044a47cdda462bdef0dcacefbf6856", "tree": "9bcc91b718769ed73828cc1891c7e1e26e79a8fc", "parents": [ "6c75969e22ffe27df64ff7477bd35fe72bface3e", "bb456928913fda2b360376afb13d9a0bc72c761c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 24 16:51:14 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 24 16:51:14 2010 -0700" }, "message": "Merge master.kernel.org:/home/rmk/linux-2.6-arm\n\n* master.kernel.org:/home/rmk/linux-2.6-arm:\n [ARM] Orion5x: replace KEY_WLAN with KEY_WPS_BUTTON\n [ARM] Kirkwood: WPS button keycode mapping\n pxa168fb: fix incorrect resource calculation\n [ARM] pxa/raumfeld: fix button name\n [ARM] pxa/raumfeld: remove duplicated #include\n [ARM] locomo: fix unpaired spin_lock_irqsave\n [ARM] locomo: fix SPI register offset\n [ARM] pxa/sharpsl: add dependency of max1111 driver to sharpsl_pm\n [ARM] pxa: remove unnecessary \u0027select FB_W100\u0027 from some platforms\n [ARM] pxa: remove spi cs gpio direction to avoid clash with driver\n [ARM] mmp: fix for variables in uncompress.h being discarded\n [ARM] pxa: fix for variables in uncompress.h being discarded\n ARM: Update mach-types\n ARM: Fix IXP23xx build error in mach/memory.h\n" }, { "commit": "b5c26f97ec4a17c650055c83cfc1f2ee6d8818eb", "tree": "d723b51966d039027bc600a40dd25c91011aa11f", "parents": [ "4fd2c20d964a8fb9861045f1022475c9d200d684" ], "author": { "name": "Michael Grzeschik", "email": "m.grzeschik@pengutronix.de", "time": "Tue Mar 23 13:35:49 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 24 16:31:22 2010 -0700" }, "message": "lxfb: set the H- and V-SYNC polarity of the flatpanel output\n\nFixup for the flatpanel output. The geode_modedb attribute flags are used\nto set the SYNC polarity of the flatpanel. Without this patch our\nflatpanel registers stayed unconfigured, so we just saw garbage output.\n\nSigned-off-by: Michael Grzeschik \u003cm.grzeschik@pengutronix.de\u003e\nCc: Andres Salomon \u003cdilinger@collabora.co.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e3396b263c6a8f086a99f1d524272ff409d66de0", "tree": "97830bac8a93f34162f9e30f7c2dda4bc128c299", "parents": [ "fe3ebaad3229c5e842e8b24cf2a24d7049a6481c" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Mon Mar 22 15:10:35 2010 +0300" }, "committer": { "name": "Eric Miao", "email": "eric.y.miao@gmail.com", "time": "Mon Mar 22 20:30:17 2010 +0800" }, "message": "pxa168fb: fix incorrect resource calculation\n\nThe size calculation is not correct. It should be end - start + 1.\nUse resource_size() to caculate it.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\n" }, { "commit": "c3a0bd7515c682f4529a35318b6712c9ae456edc", "tree": "0dea8aa7f0f1e5f37c4c67faaf3aeb18f4a04701", "parents": [ "a41842f70d6d6b0cfde3d21e163add81c4318ebd", "0d5e6f7ae8609b944c08e8a2f63f7d169c548134" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 18 16:59:10 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 18 16:59:10 2010 -0700" }, "message": "Merge master.kernel.org:/home/rmk/linux-2.6-arm\n\n* master.kernel.org:/home/rmk/linux-2.6-arm: (23 commits)\n ARM: Fix RiscPC decompressor build errors\n ARM: Fix sorting of platform group config options and includes\n ARM: 5991/1: Fix regression in restore_user_regs macro\n ARM: 5989/1: ARM: KGDB: add support for SMP platforms\n ARM: 5990/1: ARM: use __armv5tej_mmu_cache_flush for V5TEJ instead of __armv4_mmu_cache_flush\n ARM: Add final piece to fix XIP decompressor in read-only memory\n video: enable sh_mobile_lcdc on SH-Mobile ARM\n ARM: mach-shmobile: ap4evb SDHI0 platform data V2\n ARM: mach-shmobile: sh7372 SDHI vector merge\n ARM: mach-shmobile: sh7377 SDHI vector merge\n ARM: mach-shmobile: sh7367 SDHI vector merge\n ARM: mach-shmobile: G4EVM KEYSC platform data\n mtd: enable sh_flctl on SH-Mobile ARM\n ARM: mach-shmobile: G3EVM FLCTL platform data\n ARM: mach-shmobile: G3EVM KEYSC platform data\n Video: ARM CLCD: Better fix for swapped IENB and CNTL registers\n ARM: Add L2 cache handling to smp boot support\n ARM: 5960/1: ARM: perf-events: fix v7 event selection mask\n ARM: 5959/1: ARM: perf-events: request PMU interrupts with IRQF_NOBALANCING\n ARM: 5988/1: pgprot_dmacoherent() for non-mmu builds\n ...\n" }, { "commit": "61d718076e95eb461fd4c3692b702a82e2be0df4", "tree": "7c5d489840c85692bf2d14eda120cb0cb0e673c0", "parents": [ "5dbc2f543d2eb5499f3839d1abb72105cf0c03af", "ec57af9c2ece22ae6234189972105d777ff5f939" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 18 16:48:00 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 18 16:48:00 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.o-hand.com/linux-rpurdie-backlight\n\n* \u0027for-linus\u0027 of git://git.o-hand.com/linux-rpurdie-backlight:\n backlight: panasonic-laptop - Fix incomplete registration failure handling\n backlight: msi-laptop, msi-wmi: fix incomplete registration failure handling\n backlight: blackfin - Fix missing registration failure handling\n backlight: classmate-laptop - Fix missing registration failure handling\n backlight: mbp_nvidia_bl - add five more MacBook variants\n backlight: Allow properties to be passed at registration\n backlight: Add backlight_device parameter to check_fb\n video: backlight/progear, fix pci device refcounting\n backlight: l4f00242t03: Fix module licence absence.\n backlight: Revert some const qualifiers\n backlight: Add Epson L4F00242T03 LCD driver\n" }, { "commit": "7de4a9a73563e5f6f3c153015fadee433a443241", "tree": "d70e27c20bc612c58ec123e581f2ce7c02553888", "parents": [ "1097d7cef683c30f9768007daae2e961a0686a10", "f04e879bf296d136bcafd8c5a26e95599b141671" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 18 16:44:47 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 18 16:44:47 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:\n sunxvr1000: Add missing FB\u003dy depenency.\n MAINTAINERS: Add entry for sparc serial drivers.\n drivers/serial/sunsab.c: adjust the constant used to initialize the interrupt_mask0 fields\n" }, { "commit": "f04e879bf296d136bcafd8c5a26e95599b141671", "tree": "3785cc01ac8c2a70c4b6833ac449204ee259bf1a", "parents": [ "6404fccafa3bfdc0602130a87f4d93baf928bea4" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 16 14:40:42 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Mar 16 14:40:42 2010 -0700" }, "message": "sunxvr1000: Add missing FB\u003dy depenency.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fa11de0a33e214a00e205494c27fb5a7bb71a5fa", "tree": "bed4af34b31f9e782159f3c2c17fe13817df52a9", "parents": [ "f0af78991363d704694a3618b638662c97d8a110" ], "author": { "name": "Bruno Prémont", "email": "bonbons@linux-vserver.org", "time": "Fri Feb 26 13:04:54 2010 +0100" }, "committer": { "name": "Richard Purdie", "email": "rpurdie@linux.intel.com", "time": "Tue Mar 16 20:10:17 2010 +0000" }, "message": "backlight: blackfin - Fix missing registration failure handling\n\nCheck newly registered backlight_device for error and properly\nreturn error to parent\nMark struct backlight_ops as const.\n\nSigned-off-by: Bruno Prémont \u003cbonbons@linux-vserver.org\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e (constify struct backlight_ops)\nSigned-off-by: Richard Purdie \u003crpurdie@linux.intel.com\u003e\n" }, { "commit": "36bc5ee6a8d13333980fa54e97d3469d3d4cda98", "tree": "1226aedd7e07f5e4cdd090fc4dc4defa8bfde202", "parents": [ "a19a6ee6cad2b20292a774c2f56ba8039b0fac9c" ], "author": { "name": "Evan McClain", "email": "evan.mcclain@gatech.edu", "time": "Tue Mar 09 19:20:58 2010 -0500" }, "committer": { "name": "Richard Purdie", "email": "rpurdie@linux.intel.com", "time": "Tue Mar 16 19:56:08 2010 +0000" }, "message": "backlight: mbp_nvidia_bl - add five more MacBook variants\n\nThis adds the MacBook 1,1 2,1 3,1 4,1 and 4,2 to the DMI tables.\n\nSigned-off-by: Evan McClain \u003cevan.mcclain@gatech.edu\u003e\nSigned-off-by: Richard Purdie \u003crpurdie@linux.intel.com\u003e\n" }, { "commit": "a19a6ee6cad2b20292a774c2f56ba8039b0fac9c", "tree": "631916ce6181336c5c28eb0cf5484c40c92986b6", "parents": [ "57e148b6a975980944f4466ccb669b1d02dfc6a1" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Wed Feb 17 16:39:44 2010 -0500" }, "committer": { "name": "Richard Purdie", "email": "rpurdie@linux.intel.com", "time": "Tue Mar 16 19:47:54 2010 +0000" }, "message": "backlight: Allow properties to be passed at registration\n\nValues such as max_brightness should be set before backlights are\nregistered, but the current API doesn\u0027t allow that. Add a parameter to\nbacklight_device_register and update drivers to ensure that they\nset this correctly.\n\nSigned-off-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nSigned-off-by: Richard Purdie \u003crpurdie@linux.intel.com\u003e\n" }, { "commit": "57e148b6a975980944f4466ccb669b1d02dfc6a1", "tree": "dcd32f5fda62e57d5ea0eef5dcad0f1c81c90f4b", "parents": [ "a4ebb780e194e8751dc22deeabcddd3fdc8f18f0" ], "author": { "name": "Bruno Prémont", "email": "bonbons@linux-vserver.org", "time": "Sun Feb 21 00:20:01 2010 +0100" }, "committer": { "name": "Richard Purdie", "email": "rpurdie@linux.intel.com", "time": "Tue Mar 16 19:47:54 2010 +0000" }, "message": "backlight: Add backlight_device parameter to check_fb\n\ncheck_fb from backlight_ops lacks a reference to the backlight_device\nthat\u0027s being referred to. Add this parameter so a backlight_device\ncan be mapped to a single framebuffer, especially if the same driver\nhandles multiple devices on a single system.\n\nSigned-off-by: Bruno Prémont \u003cbonbons@linux-vserver.org\u003e\nSigned-off-by: Richard Purdie \u003crpurdie@linux.intel.com\u003e\n" }, { "commit": "a4ebb780e194e8751dc22deeabcddd3fdc8f18f0", "tree": "490cac976b02f53ac5596d66ba6adaffa2e698ba", "parents": [ "c3cf2e44d3bbc694eccef33b0f2fe8e2d89baae7" ], "author": { "name": "Jiri Slaby", "email": "jslaby@suse.cz", "time": "Tue Feb 02 14:44:50 2010 -0800" }, "committer": { "name": "Richard Purdie", "email": "rpurdie@linux.intel.com", "time": "Tue Mar 16 19:47:54 2010 +0000" }, "message": "video: backlight/progear, fix pci device refcounting\n\nStanse found an ommitted pci_dev_puts on error path in progearbl_probe.\npmu_dev and sb_dev are gotten, but never put when\nbacklight_device_register fails.\n\nSo unify fail paths and put the devs when the failure occurs.\n\nSigned-off-by: Jiri Slaby \u003cjslaby@suse.cz\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Richard Purdie \u003crpurdie@linux.intel.com\u003e\n" }, { "commit": "c3cf2e44d3bbc694eccef33b0f2fe8e2d89baae7", "tree": "6702ad9505485ae2fb188d7942f5ff489b33f1b4", "parents": [ "b4144e4f6e3b448d322095ca08af393682a69e33" ], "author": { "name": "Alberto Panizzo", "email": "maramaopercheseimorto@gmail.com", "time": "Tue Jan 19 09:30:50 2010 +0100" }, "committer": { "name": "Richard Purdie", "email": "rpurdie@linux.intel.com", "time": "Tue Mar 16 19:47:53 2010 +0000" }, "message": "backlight: l4f00242t03: Fix module licence absence.\n\nSigned-off-by: Alberto Panizzo \u003cmaramaopercheseimorto@gmail.com\u003e\nSigned-off-by: Richard Purdie \u003crpurdie@linux.intel.com\u003e\n" }, { "commit": "e7fb9c4ad351a8da7c09e182bd2e7ccd043daf08", "tree": "dc3dc3f491e01d987d7edd82f37fac994cd8ac7c", "parents": [ "a3d3203e4bb40f253b1541e310dc0f9305be7c84" ], "author": { "name": "Alberto Panizzo", "email": "maramaopercheseimorto@gmail.com", "time": "Fri Dec 18 16:42:11 2009 +0100" }, "committer": { "name": "Richard Purdie", "email": "rpurdie@linux.intel.com", "time": "Tue Mar 16 19:47:53 2010 +0000" }, "message": "backlight: Add Epson L4F00242T03 LCD driver\n\nThe Epson LCD L4F00242T03 is mounted on the Freescale i.MX31 PDK board. \nBased upon Marek Vasut work in l4f00242t03.c, this driver provides\nbasic init and power on/off functionality for this device through the\nsysfs lcd interface.\n\nUnfortunately Datasheet for this device are not available and\nall the control sequences sent to the display were copied from the\nfreescale driver that in the i.MX31 Linux BSP.\n\nAs in the i.MX31PDK board the core and io suppliers are voltage\nregulators, that functionality is embedded here, but not strict.\n\nSigned-off-by: Alberto Panizzo \u003cmaramaopercheseimorto@gmail.com\u003e\nSigned-off-by: Richard Purdie \u003crpurdie@linux.intel.com\u003e\n" }, { "commit": "2d3b5fa3a39d16c880bda3cf2bd9dd6ed5a01f74", "tree": "e20283fe2ed46aa35c8ca5fc1724ba067cd2e2f8", "parents": [ "3f17522ce461a31e7ced6311b28fcf5b8a763316", "7278a22143b003e9af7b9ca1b5f1c40ae4b55d98" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Mar 15 14:27:06 2010 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Mar 15 14:27:06 2010 +0000" }, "message": "Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6\n" }, { "commit": "8871d54b5e1558bd59baad02eb7a80f86d49f4a1", "tree": "428979f00896e85ce86c4f85003394648ca09ed5", "parents": [ "ce619e1fb86d68f125e0e6d10a5484f67a6d97b3" ], "author": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Thu Mar 04 17:52:43 2010 +0200" }, "committer": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Mon Mar 15 11:07:40 2010 +0200" }, "message": "OMAP: DSS2: panel-generic: re-implement mode changing\n\nMode changing code was left out with the DSS driver remodeling. Add the\ncode back.\n\nSigned-off-by: Tomi Valkeinen \u003ctomi.valkeinen@nokia.com\u003e\n" }, { "commit": "ce619e1fb86d68f125e0e6d10a5484f67a6d97b3", "tree": "155c741ceb835eded05ec4fb43c688f58bd89bfe", "parents": [ "5c1f96f4cffbdde9e194f3ae5373953f3fa12836" ], "author": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Fri Mar 12 12:46:05 2010 +0200" }, "committer": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Mon Mar 15 10:34:52 2010 +0200" }, "message": "OMAP: DSS2: initialize dss clk sources properly\n\nClk sources were not initialized, leading to kernel crash, or possibly to\nstrange behaviour if DSI was compiled in.\n\nSigned-off-by: Tomi Valkeinen \u003ctomi.valkeinen@nokia.com\u003e\n" }, { "commit": "7278a22143b003e9af7b9ca1b5f1c40ae4b55d98", "tree": "5c55a7e679dc75210c178cb16ceecdb7ef6eb86a", "parents": [ "3a14d0397732b6aaa541348b5a8e8f639ecd02b7" ], "author": { "name": "Magnus Damm", "email": "damm@opensource.se", "time": "Wed Mar 10 11:33:10 2010 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Mon Mar 15 12:14:16 2010 +0900" }, "message": "video: enable sh_mobile_lcdc on SH-Mobile ARM\n\nThis patch enables the sh_mobile_lcdc driver on\nSH-Mobile ARM.\n\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "3f17522ce461a31e7ced6311b28fcf5b8a763316", "tree": "f2fde33f7e2887ad99b7579c9c05a30a424a31f2", "parents": [ "1027247f6eb727db6c600b9eb02796f0766ae704" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Feb 12 14:32:01 2010 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sun Mar 14 19:42:44 2010 +0000" }, "message": "Video: ARM CLCD: Better fix for swapped IENB and CNTL registers\n\nOn PL111, as found on Realview and other platforms, these registers are\nalways arranged as CNTL then IENB. On PL110, these registers are IENB\nthen CNTL, except on Versatile platforms.\n\nRe-arrange the handling of these register swaps so that PL111 always\ngets it right without resorting to ifdefs, leaving the only case needing\nspecial handling being PL110 on Versatile.\n\nFill out amba/clcd.h with the PL110/PL111 register definition\ndifferences in case someone tries to use the PL110 specific definitions\non PL111.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "3474cbd11df8cdd6413781ea95bd51dd469098ff", "tree": "c8d78f415c00bad503541bee6dd68055997c3ad7", "parents": [ "d89b218b801fd93ea95880f1c7fde348cbcc51c5", "2d378b9179881b46a0faf11430efb421fe03ddd8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 13 21:29:38 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 13 21:29:38 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:\n sparc64: Add very basic XVR-1000 framebuffer driver.\n qlogicpti: Remove slash in QlogicPTI irq name\n" }, { "commit": "2d378b9179881b46a0faf11430efb421fe03ddd8", "tree": "1f65ae4340bef3fdf11de7ced150d939f602461c", "parents": [ "77d3926306bf4eecac50150ba5625797219f14ba" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 13 16:25:03 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Mar 13 16:25:03 2010 -0800" }, "message": "sparc64: Add very basic XVR-1000 framebuffer driver.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Frans van Berckel \u003cfberckel@xs4all.nl\u003e\n" }, { "commit": "c32da02342b7521df25fefc2ef20aee0e61cf887", "tree": "7e38f664fa3e13602c357d37f77d8adcf82fccc2", "parents": [ "dca1d9f6d7ae428c193f32bd3e9a4ca13176648b", "318ae2edc3b29216abd8a2510f3f80b764f06858" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 16:04:50 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 16:04:50 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (56 commits)\n doc: fix typo in comment explaining rb_tree usage\n Remove fs/ntfs/ChangeLog\n doc: fix console doc typo\n doc: cpuset: Update the cpuset flag file\n Fix of spelling in arch/sparc/kernel/leon_kernel.c no longer needed\n Remove drivers/parport/ChangeLog\n Remove drivers/char/ChangeLog\n doc: typo - Table 1-2 should refer to \"status\", not \"statm\"\n tree-wide: fix typos \"ass?o[sc]iac?te\" -\u003e \"associate\" in comments\n No need to patch AMD-provided drivers/gpu/drm/radeon/atombios.h\n devres/irq: Fix devm_irq_match comment\n Remove reference to kthread_create_on_cpu\n tree-wide: Assorted spelling fixes\n tree-wide: fix \u0027lenght\u0027 typo in comments and code\n drm/kms: fix spelling in error message\n doc: capitalization and other minor fixes in pnp doc\n devres: typo fix s/dev/devm/\n Remove redundant trailing semicolons from macros\n fix typo \"definetly\" -\u003e \"definitely\" in comment\n tree-wide: s/widht/width/g typo in comments\n ...\n\nFix trivial conflict in Documentation/laptops/00-INDEX\n" }, { "commit": "dca1d9f6d7ae428c193f32bd3e9a4ca13176648b", "tree": "02de8c3503c1c811754423d2fa3f3b4978044f6e", "parents": [ "9ff99339447de403a46be5e3f23d0c794d540b06", "91e013827c0bcbb187ecf02213c5446b6f62d445" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 16:00:54 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 16:00:54 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027for-linus\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm: (370 commits)\n ARM: S3C2443: Add set_rate and round_rate calls for armdiv clock\n ARM: S3C2443: Remove #if 0 for clk_mpll\n ARM: S3C2443: Update notes on MPLLREF clock\n ARM: S3C2443: Further clksrc-clk conversions\n ARM: S3C2443: Change to using plat-samsung clksrc-clk implementation\n USB: Fix s3c-hsotg build following Samsung platform header moves\n ARM: S3C64XX: Reintroduce unconditional build of audio device\n ARM: 5961/1: ux500: fix CLKRST addresses\n ARM: 5977/1: arm: Enable backtrace printing on oops when PC is corrupted\n ASoC: Fix S3C64xx IIS driver for Samsung header reorg\n ARM: S3C2440: Fix plat-s3c24xx move of s3c2440/s3c2442 support\n [ARM] pxa: fix typo in mxm8x10.h\n [ARM] pxa/raumfeld: set GPIO drive bits for LED pins\n [ARM] pxa/zeus: Add support for mcp2515 CAN bus\n [ARM] pxa/zeus: Add support for onboard max6369 watchdog\n [ARM] pxa/zeus: Add Eurotech as the manufacturer\n [ARM] pxa/zeus: Correct the USB host initialisation flags\n [ARM] pxa/zeus: Allow usage of 8250-compatible UART in uncompress\n [ARM] pxa: refactor uncompress.h for non-PXA uarts\n [ARM] mmp2: fix incorrect calling of chip-\u003emask_ack() for 2nd level cascaded IRQs\n ...\n" }, { "commit": "2cb9a75d13676d75bcc6fbc6f885403795581913", "tree": "391c2ef24f5248c28cbeeeae7152d7e3169e0c63", "parents": [ "a8b1925430339be1464a9a028754d94984dacfdb" ], "author": { "name": "Huang Weiyi", "email": "weiyi.huang@gmail.com", "time": "Wed Mar 10 15:21:51 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:34 2010 -0800" }, "message": "fbdev: bfin-lq035q1-fb: remove duplicated #include\n\nRemove duplicated #include(\u0027s) in\n drivers/video/bfin-lq035q1-fb.c\n\nSigned-off-by: Huang Weiyi \u003cweiyi.huang@gmail.com\u003e\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a8b1925430339be1464a9a028754d94984dacfdb", "tree": "3c1fc77ec4a00c6ea92fec0f13901c6aa86a86ac", "parents": [ "2164235da9153f1fbd5191bf71c86fae322c7dd7" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Wed Mar 10 15:21:49 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:34 2010 -0800" }, "message": "video: fix first line of kernel-doc for a few functions\n\nThe function name must be followed by a space, hypen, space, and a short\ndescription.\n\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2164235da9153f1fbd5191bf71c86fae322c7dd7", "tree": "3497d18e2ab9918aaf0f60c8b9b1daaf2027176b", "parents": [ "2c0e0c88422033c9b6162bf7875aecdd095130b7" ], "author": { "name": "Christoph Egger", "email": "siccegge@stud.informatik.uni-erlangen.de", "time": "Wed Mar 10 15:21:49 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:34 2010 -0800" }, "message": "obsolete config in kernel source: LWMON5\n\nThere was some conditionalizing for the LWMON5 boards in kernel source.\nHowever infrastructure for enabling this isn\u0027t here so probably the\nspecial case code can go as well.\n\nSigned-off-by: Christoph Egger \u003csiccegge@stud.informatik.uni-erlangen.de\u003e\nAcked-by: Alexander Shishkin \u003cvirtuoso@slind.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2c0e0c88422033c9b6162bf7875aecdd095130b7", "tree": "b2d61e5057965793908f0690d7cdfa180cf6f9f0", "parents": [ "8661970875d7d27e4de233d357327fffdb4a5e3d" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Wed Mar 10 15:21:48 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:34 2010 -0800" }, "message": "drivers/video/via: fix continuation line formats\n\nString constants that are continued on subsequent lines with \\ will cause\nspurious whitespace in the resulting output.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nAcked-by: Florian Tobias Schandinat \u003cFlorianSchandinat@gmx.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8661970875d7d27e4de233d357327fffdb4a5e3d", "tree": "7b8cb8c11bc5e66da62cccf8fd77201415183353", "parents": [ "91d4e0a4c889e3e8078c26542b8f5a322b87adf4" ], "author": { "name": "Wang Qiang", "email": "rurality.linux@gmail.com", "time": "Wed Mar 10 15:21:47 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:34 2010 -0800" }, "message": "NUC900 LCD Controller Driver\n\nAn LCD controller driver for nuc900s. The Linux LOGO is just fine and the\nFB-Test application was ok, too.\n\nSigned-off-by: Wang Qiang \u003crurality.linux@gmail.com\u003e\nCc: Wang Zongshun \u003cmcuos.com@gmail.com\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nCc: Krzysztof Helt \u003ckrzysztof.h1@poczta.fm\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "91d4e0a4c889e3e8078c26542b8f5a322b87adf4", "tree": "c7dc5def96725767ebafbe7a1b61f5460bc85354", "parents": [ "55a23c4af83df9c8fdf55690a09a3f0a92bd127b" ], "author": { "name": "Christoph Egger", "email": "siccegge@stud.informatik.uni-erlangen.de", "time": "Wed Mar 10 15:21:46 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:34 2010 -0800" }, "message": "fbdev: remove obsolete CONFIG_FB_SOFT_CURSOR\n\nThe config Option FB_SOFT_BUFFER was removed in\nc465e05a03209651078b95686158648fd7ed84c5 (\"fbcon/fbdev: Move softcursor\nout of fbdev to fbcon\").\n\nWhile moving to fbcon this single driver has it left as a select in\nKConfig / #ifdef in source. This last occurence is removed here so the\noption is really gone\n\nSigned-off-by: Christoph Egger \u003csiccegge@stud.informatik.uni-erlangen.de\u003e\nCc: Krzysztof Helt \u003ckrzysztof.h1@poczta.fm\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b32bfc3843f7fd090d30853d98866d923cfb8fff", "tree": "adc8452addb65d4e6ef0113bafe70d22b9d9f2d4", "parents": [ "2afb18981739a1426af2a6c952e03c5966b3dfc6" ], "author": { "name": "Jaya Kumar", "email": "jayakumar.lkml@gmail.com", "time": "Wed Mar 10 15:21:43 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:34 2010 -0800" }, "message": "broadsheetfb: support storing waveform\n\nThis patch adds waveform storing capability to broadsheetfb. It uses the\nfirmware class to retrieve the waveform, and the request to initiate the\nwaveform storing is done via a driver sysfs entry, loadstore_waveform.\n\nBroadsheet is a framebuffer device. It is slightly different from a\ntypical framebuffer controller that drives a normal TFT-LCD display. Most\nE-Ink display panels require a waveform in order to function. That is, in\norder to drive the state of a pixel to black, gray, or white, a specific\nwaveform is utilized. Basically, that waveform represents the specific\nE-field wiggling needed to get the pixel to its optimal state given\ncurrent temperature, and its previous state. TN/IPS-LCDs use a similar\nconcept but the driving waveform is sufficiently simple that it is\ninternalized in the TFT source/gate driver.\n\nThese E-Ink waveforms are specific to a production batch. That is, a\nbatch of display films are produced, then they get characterized and a\nwaveform is generated for that batch. Broadsheet, typically, is attached\nto its private SPI flash which is then flashed with this waveform.\n\nUsers won\u0027t be able to see the waveform and typically won\u0027t ever need to\nknow about it. If however, the display panel attached to broadsheet is\nchanged out, then they will need to update their waveform. That would\ntypically be done at a factory or repair facility rather than by a user.\n\n[akpm@linux-foundation.org: fix printk warning]\nSigned-off-by: Jaya Kumar \u003cjayakumar.lkml@gmail.com\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Krzysztof Helt \u003ckrzysztof.h1@wp.pl\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2afb18981739a1426af2a6c952e03c5966b3dfc6", "tree": "fb1feeb9e7882a4810bf9088959e33a1148bc090", "parents": [ "e17cea3cece6d3ec47a5b358821505943abe6541" ], "author": { "name": "Jaya Kumar", "email": "jayakumar.lkml@gmail.com", "time": "Wed Mar 10 15:21:41 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:34 2010 -0800" }, "message": "broadsheetfb: add MMIO hooks\n\nAllow boards with GP-MMIO controllers to provide hooks to broadsheetfb in\norder to offload cmd/data writes and data reads instead of relying only on\nhost based GPIO wiggling.\n\nSigned-off-by: Jaya Kumar \u003cjayakumar.lkml@gmail.com\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Krzysztof Helt \u003ckrzysztof.h1@wp.pl\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e17cea3cece6d3ec47a5b358821505943abe6541", "tree": "cf474d56ab2a700577dc0c3cc4bb6f33d1e56154", "parents": [ "415559fbf2353f4271a4cd6e11259b8bbc97cc33" ], "author": { "name": "Florian Tobias Schandinat", "email": "FlorianSchandinat@gmx.de", "time": "Wed Mar 10 15:21:41 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:34 2010 -0800" }, "message": "viafb: support color depth 15 and 30\n\nAdd support for the color depth 15 on IGA1 and 30 on IGA1 and IGA2. To\nallow the usage of those the driver now refuses color depth that are\ntotally off and otherwise the selection in viafb_check_var is used.\nTherefore the first call to this for the first framebuffer was delayed a\nbit. It only enables the new formats if they are requested exactly\n(viafb_bpp\u003d15|30).\n\nAs this is a new feature, no regressions are expected. The color depth 15\nwas successfully tested. Didn\u0027t get anything usable for 30 but that might\nbe the programs fault. I would like to get some feedback whether it works\nas expected or not if somebody knows a program/configuration where it\nshould.\n\nSigned-off-by: Florian Tobias Schandinat \u003cFlorianSchandinat@gmx.de\u003e\nCc: Joseph Chan \u003cJosephChan@via.com.tw\u003e\nCc: Scott Fang \u003cScottFang@viatech.com.cn\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "415559fbf2353f4271a4cd6e11259b8bbc97cc33", "tree": "4bcece3887bfc489d096f60ae28a688a31abe6fd", "parents": [ "dbb7884be758ca9ac5ec84cbe7eb21f21bce9d8f" ], "author": { "name": "Florian Tobias Schandinat", "email": "FlorianSchandinat@gmx.de", "time": "Wed Mar 10 15:21:40 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:34 2010 -0800" }, "message": "viafb: rework color setting\n\nThis is a rewritten version of viafb_setcolreg. The hardware register\nwrites were split up and moved to hw.c where they belong as this is really\nlow level stuff. It was made dual fb aware.\n\nFurthermore viafb_setcmap was removed as the problem with 8bpp originated\nfrom a bug in writing multiple color registers at once. The removal of\nviafb_setcmap might introduce a small performance regression but its\ncertainly better to receive the correct result a bit slower than a garbled\npicture fast. It should give us a working 8bpp mode and is more\nextensible than the old hardcoded code. No other regressions are expected\nbut as the hardware might be a bit picky it might cause some regressions\nin 8bpp mode on some hardware although I doubt that.\n\nSigned-off-by: Florian Tobias Schandinat \u003cFlorianSchandinat@gmx.de\u003e\nCc: Joseph Chan \u003cJosephChan@via.com.tw\u003e\nCc: Scott Fang \u003cScottFang@viatech.com.cn\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "dbb7884be758ca9ac5ec84cbe7eb21f21bce9d8f", "tree": "4e6bbb4859ff6831310eef83ab8458040c015df3", "parents": [ "bd140691bda491b417a6d1e81b03416b54cb8d8d" ], "author": { "name": "Florian Tobias Schandinat", "email": "FlorianSchandinat@gmx.de", "time": "Wed Mar 10 15:21:39 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:34 2010 -0800" }, "message": "viafb: some virtual_xres handling fixes\n\nDo not require the virtual_xres to be aligned as line length is for such\npurposes. Calculate always the smallest line length required.\n\nSigned-off-by: Florian Tobias Schandinat \u003cFlorianSchandinat@gmx.de\u003e\nCc: Joseph Chan \u003cJosephChan@via.com.tw\u003e\nCc: Scott Fang \u003cScottFang@viatech.com.cn\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bd140691bda491b417a6d1e81b03416b54cb8d8d", "tree": "f19f8fcd1acd4b6ae60ed4ba261e9106f3452793", "parents": [ "dba77f8409eb861b28d295211776d953a8255ec7" ], "author": { "name": "Florian Tobias Schandinat", "email": "FlorianSchandinat@gmx.de", "time": "Wed Mar 10 15:21:38 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:33 2010 -0800" }, "message": "viafb: rework color checking\n\nMake color checking a bit more tolerant in what values it allows and more\nfine grained to later support 15 and 30 bits formats. It splits the\nfilling of the color information in var to a seperate function and sets\nsome color related values in var that where previously untouched.\n\nThis could be a bug fix but at least I don\u0027t know any applications that\nwas fooled by not correctly setting the fields in var. At least no\nregressions are expected.\n\nSigned-off-by: Florian Tobias Schandinat \u003cFlorianSchandinat@gmx.de\u003e\nCc: Joseph Chan \u003cJosephChan@via.com.tw\u003e\nCc: Scott Fang \u003cScottFang@viatech.com.cn\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "dba77f8409eb861b28d295211776d953a8255ec7", "tree": "0214d1b9200572564ab1b856f52f78acaeaa2922", "parents": [ "4bbac05f8c0ab40dcc52ed6dff44e1b0d80fa6e3" ], "author": { "name": "Florian Tobias Schandinat", "email": "FlorianSchandinat@gmx.de", "time": "Wed Mar 10 15:21:37 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:33 2010 -0800" }, "message": "viafb: make some variables a bit less global\n\nMove some variables closer to their usage.\n\nSigned-off-by: Florian Tobias Schandinat \u003cFlorianSchandinat@gmx.de\u003e\nCc: Scott Fang \u003cScottFang@viatech.com.cn\u003e\nCc: Joseph Chan \u003cJosephChan@via.com.tw\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4bbac05f8c0ab40dcc52ed6dff44e1b0d80fa6e3", "tree": "2829ac5401f88c99e4f796d7445f9311cd34670c", "parents": [ "daacccd1657bdecae8f7c98a8e2b84367a8d4e87" ], "author": { "name": "Florian Tobias Schandinat", "email": "FlorianSchandinat@gmx.de", "time": "Wed Mar 10 15:21:36 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:33 2010 -0800" }, "message": "viafb: remove dead code due to IGA1_IGA2\n\nSome code depended on IGA1_IGA2 which was never set (at least with the\nsymbolic name). Remove this dead code although it might one day be useful\nto get a hint on how some things might work. However as this is dead it\nis likely full of bugs and would prevent a clean structure (as it has some\nvery strange things).\n\nDead code -\u003e no regressions, at least if VIA doesn\u0027t do anything very ugly.\n\nSigned-off-by: Florian Tobias Schandinat \u003cFlorianSchandinat@gmx.de\u003e\nCc: Scott Fang \u003cScottFang@viatech.com.cn\u003e\nCc: Joseph Chan \u003cJosephChan@via.com.tw\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "daacccd1657bdecae8f7c98a8e2b84367a8d4e87", "tree": "47d770e03d53bcb6174bc6cd0397773b1d6a3a9e", "parents": [ "fe9aab8ec2d65378b0663c3287a67da4a892b54e" ], "author": { "name": "Florian Tobias Schandinat", "email": "FlorianSchandinat@gmx.de", "time": "Wed Mar 10 15:21:35 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:33 2010 -0800" }, "message": "viafb: split color mode setting up\n\nThis patch splits color mode setting up in seperate functions. Some\nhardware initialization that was previously mixed with it is moved to\nviafb_setmode. As are the calls to the newly created function. This is\nyet another little step towards controlling each IGA on its own.\n\nAs this patch really aims too mimic the old behaviour no regressions are\nexpected. However I noticed that 8bpp (or 6bpp?) seems actually a bit\nbroken before and after the patch.\n\nSigned-off-by: Florian Tobias Schandinat \u003cFlorianSchandinat@gmx.de\u003e\nCc: Scott Fang \u003cScottFang@viatech.com.cn\u003e\nCc: Joseph Chan \u003cJosephChan@via.com.tw\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fe9aab8ec2d65378b0663c3287a67da4a892b54e", "tree": "222f904efc46a28649dbe4e7d3813bf3ab73715e", "parents": [ "5c9443ed284fc6ec8a4f702c66e9ad6bdf912c05" ], "author": { "name": "Florian Tobias Schandinat", "email": "FlorianSchandinat@gmx.de", "time": "Wed Mar 10 15:21:34 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:33 2010 -0800" }, "message": "viafb: introduce strict parameter checking\n\nRefuse to work if wrong parameters are given. This should improve the\nuser experience as it will be clear that something is wrong and not\nsilently ignored.\n\nSigned-off-by: Florian Tobias Schandinat \u003cFlorianSchandinat@gmx.de\u003e\nCc: Scott Fang \u003cScottFang@viatech.com.cn\u003e\nCc: Joseph Chan \u003cJosephChan@via.com.tw\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5c9443ed284fc6ec8a4f702c66e9ad6bdf912c05", "tree": "3eee936484402bcaf06c99e593707ca256e305aa", "parents": [ "ee79d54db45bb5e6da3eb76bae162c920aeb9763" ], "author": { "name": "Florian Tobias Schandinat", "email": "FlorianSchandinat@gmx.de", "time": "Wed Mar 10 15:21:34 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:33 2010 -0800" }, "message": "viafb: make viafb_set_par more dual framebuffer compatible\n\nThis patch is an attempt to make viafb_set_par work correctly with more\nthan one framebuffer. As modesetting is not (yet/easily) possible for\neach individual IGA it uses the (normally to be avoided) global variables\nviafbinfo{,1} to ensure that each function is called with the correct\nvalues.\n\nThis patch (finally) allows usable dual framebuffer setups and should not\naffect non dual fb ones. It works in some (most?) configurations as\nsometimes the driver still gets device connections wrong. It can be worth\nto try the devices in reverse order (in viafb_active_dev).\n\nThe user experience is still not very nice as:\n\n- on the second fb you\u0027ll normally have a garbled picture as long as\n no application draws to it\n goal: auto on/off devices depending on reference counting\n- as the whole machinery is always done you can see mode changes also\n in an unaffected framebuffer\n goal: split modesetting up for each individual IGA\n\nSigned-off-by: Florian Tobias Schandinat \u003cFlorianSchandinat@gmx.de\u003e\nCc: Scott Fang \u003cScottFang@viatech.com.cn\u003e\nCc: Joseph Chan \u003cJosephChan@via.com.tw\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ee79d54db45bb5e6da3eb76bae162c920aeb9763", "tree": "e1b0074554376d446ef41034ad47fb21e054e853", "parents": [ "7cf607923dee1898b9fc1e62568b79e7f785b995" ], "author": { "name": "Florian Tobias Schandinat", "email": "FlorianSchandinat@gmx.de", "time": "Wed Mar 10 15:21:32 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:33 2010 -0800" }, "message": "viafb: video address setting revisited\n\nSet always the correct video address. Especially do panning right on\nmultiple IGAs.\n\nThis should have no effect on single monitor mode (no SAMM, no dual fb).\nFor SAMM without dual fb this might break something as I really cannot\nimage what we are supposed to do for different resolutions with a single\nframebuffer as we can\u0027t get data out of nowhere (no, they are not set up\nin something one would call \"expanded\"). Previously I got for that funny\ncolored pictures as the second IGA pointed to video memory that was never\nwritten to. After the patch it\u0027ll work as cloning if the first and second\nmode are identical (this was working already without SAMM). Finally for\ndual fb this should push us a step in the right direction.\n\nSigned-off-by: Florian Tobias Schandinat \u003cFlorianSchandinat@gmx.de\u003e\nCc: Scott Fang \u003cScottFang@viatech.com.cn\u003e\nCc: Joseph Chan \u003cJosephChan@via.com.tw\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7cf607923dee1898b9fc1e62568b79e7f785b995", "tree": "86076119b2f2c92717d12851cd8a9454e01c620e", "parents": [ "d8566b29e86ef3906dd6c0ea4a02c2a925748da5" ], "author": { "name": "Florian Tobias Schandinat", "email": "FlorianSchandinat@gmx.de", "time": "Wed Mar 10 15:21:31 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:33 2010 -0800" }, "message": "viafb: reorder initialization for dual framebuffer mode\n\nThis patch reorders the initialization for dual framebuffer mode to not\nignore the settings for the first mode. Previously they were overwritten\nwith the settings for the second one before they were applied.\n\nThis should have no effect on non dual framebuffer mode and do what the\nuser intended (initalization to desired modes) in dual framebuffer mode.\n\nSigned-off-by: Florian Tobias Schandinat \u003cFlorianSchandinat@gmx.de\u003e\nCc: Scott Fang \u003cScottFang@viatech.com.cn\u003e\nCc: Joseph Chan \u003cJosephChan@via.com.tw\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d8566b29e86ef3906dd6c0ea4a02c2a925748da5", "tree": "1a3e5660d03aa24e206e4022dd77733fbf524535", "parents": [ "c5f06f5cddd6681b978ffdb53755e28eefccb1bb" ], "author": { "name": "Florian Tobias Schandinat", "email": "FlorianSchandinat@gmx.de", "time": "Wed Mar 10 15:21:30 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:33 2010 -0800" }, "message": "viafb: yet another dead code removal\n\nRemove some functions that were never executed and a related undocumented\nmodule parameter.\n\nSigned-off-by: Florian Tobias Schandinat \u003cFlorianSchandinat@gmx.de\u003e\nCc: Scott Fang \u003cScottFang@viatech.com.cn\u003e\nCc: Joseph Chan \u003cJosephChan@via.com.tw\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c5f06f5cddd6681b978ffdb53755e28eefccb1bb", "tree": "cf195fe5b85a03fbb4be13b905e3e4b8faed21a9", "parents": [ "9b24b00c364bb3bfa717ba2ead258a527b20cc5f" ], "author": { "name": "Florian Tobias Schandinat", "email": "FlorianSchandinat@gmx.de", "time": "Wed Mar 10 15:21:30 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:33 2010 -0800" }, "message": "viafb: some dvi cleanup\n\nRemove some unused variables, move some dvi code around and store the\ndetected maximum resolution for later use. The vertical resolution is\nhandled as the old code did it but I hope it can be read from the hardware\nsome day.\n\nNo runtime change expected.\n\nSigned-off-by: Florian Tobias Schandinat \u003cFlorianSchandinat@gmx.de\u003e\nCc: Joseph Chan \u003cJosephChan@via.com.tw\u003e\nCc: Scott Fang \u003cScottFang@viatech.com.cn\u003e\nCc: Krzysztof Helt \u003ckrzysztof.h1@poczta.fm\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9b24b00c364bb3bfa717ba2ead258a527b20cc5f", "tree": "f59fff4dc5a4631a6d148353f7ce17c47c131984", "parents": [ "dd73d6868b9ecb4841def0c6ff0a25da27db33ba" ], "author": { "name": "Florian Tobias Schandinat", "email": "FlorianSchandinat@gmx.de", "time": "Wed Mar 10 15:21:29 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:33 2010 -0800" }, "message": "viafb: remove the remaining VIA_RES_* uses\n\nRemove the rest of the VIA_RES_* use cases. Obviously this was no longer\nuseful. Keep the related infrastructure/functions for later use.\n\nNo runtime impact expected.\n\nSigned-off-by: Florian Tobias Schandinat \u003cFlorianSchandinat@gmx.de\u003e\nCc: Joseph Chan \u003cJosephChan@via.com.tw\u003e\nCc: Scott Fang \u003cScottFang@viatech.com.cn\u003e\nCc: Krzysztof Helt \u003ckrzysztof.h1@poczta.fm\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "dd73d6868b9ecb4841def0c6ff0a25da27db33ba", "tree": "353558254ac6ad9561beb6f3bac7b5254301c95c", "parents": [ "2365dfe99495159b3395dd0eddece2f0d58f527a" ], "author": { "name": "Florian Tobias Schandinat", "email": "FlorianSchandinat@gmx.de", "time": "Wed Mar 10 15:21:28 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:33 2010 -0800" }, "message": "viafb: split global index up\n\nThis is the first step to remove an artificial global index that was used\nin two ways:\n\n1. As a pseudo index in the mode table. Pseudo as you had to search\n through the table to find the referenced entry. This was replaced by\n using a pointer to the entry.\n\n2. As a shortcut to compare a combination of horizontal and vertical\n resolution at the same time.\n\n This was replaced by a \"(hres\u003c\u003c16) | vres\" which is good enough for\n now and the near future. If vres or hres become greater than 2^16 this\n might indeed cause problems but this solution allows to split this\n indexing mess up without the requirement to do even more code changes.\n\nThis is a big change that will allow more clean ups. It should be a bit\nfaster but that is probably not relevant for normal operation. No\nregressions expected but as this is a relatively big step heavy testing is\nappreciated.\n\nSigned-off-by: Florian Tobias Schandinat \u003cFlorianSchandinat@gmx.de\u003e\nCc: Joseph Chan \u003cJosephChan@via.com.tw\u003e\nCc: Scott Fang \u003cScottFang@viatech.com.cn\u003e\nCc: Krzysztof Helt \u003ckrzysztof.h1@poczta.fm\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2365dfe99495159b3395dd0eddece2f0d58f527a", "tree": "04d7f4a6b49ebd80b2554323ea033b6805c5cc87", "parents": [ "cc8b82f8c80e8b9e212e0102ee7af9972829e45c" ], "author": { "name": "Florian Tobias Schandinat", "email": "FlorianSchandinat@gmx.de", "time": "Wed Mar 10 15:21:27 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:33 2010 -0800" }, "message": "viafb: remove dead code\n\nRemove a completly unused function.\n\nSigned-off-by: Florian Tobias Schandinat \u003cFlorianSchandinat@gmx.de\u003e\nCc: Joseph Chan \u003cJosephChan@via.com.tw\u003e\nCc: Scott Fang \u003cScottFang@viatech.com.cn\u003e\nCc: Krzysztof Helt \u003ckrzysztof.h1@poczta.fm\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cc8b82f8c80e8b9e212e0102ee7af9972829e45c", "tree": "7ab8d18d8aba141dd8f98b29f95d05d8ddb662e8", "parents": [ "c1c341a060da1bd66a1982198b1a99765b07b8a2" ], "author": { "name": "Florian Tobias Schandinat", "email": "FlorianSchandinat@gmx.de", "time": "Wed Mar 10 15:21:26 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:32 2010 -0800" }, "message": "viafb: deprecate private ioctls\n\nPrint a warning when viafb ioctls are called. Those should not be used as\ntheir exact meaning is sometimes unknown and they in parts duplicate\nfunctionality present in the framebuffer interface.\n\nThere is no known user of these ioctls.\n\nSigned-off-by: Florian Tobias Schandinat \u003cFlorianSchandinat@gmx.de\u003e\nCc: Joseph Chan \u003cJosephChan@via.com.tw\u003e\nCc: Scott Fang \u003cScottFang@viatech.com.cn\u003e\nCc: Krzysztof Helt \u003ckrzysztof.h1@poczta.fm\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c1c341a060da1bd66a1982198b1a99765b07b8a2", "tree": "775a7bccfc5139450e312c6a3a1dd643aae4ceb8", "parents": [ "d40f29bff30a1a50d7ad69bd150c9cda1ce1ba9d" ], "author": { "name": "Jaya Kumar", "email": "jayakumar.lkml@gmail.com", "time": "Wed Mar 10 15:21:24 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:32 2010 -0800" }, "message": "broadsheetfb: add multiple panel type support\n\nUpdate broadsheetfb to add support for multiple panel types. The 3.7\" and\n6\" are known to work but the 9.7\" is untested due to lack of hardware.\n\nSigned-off-by: Jaya Kumar \u003cjayakumar.lkml@gmail.com\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Krzysztof Helt \u003ckrzysztof.h1@wp.pl\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d40f29bff30a1a50d7ad69bd150c9cda1ce1ba9d", "tree": "dd83d32b45588d06e1150f899f93faf6c1d6f566", "parents": [ "0d3580d40cc38bbaf63d0b2756931e0ae241a9ea" ], "author": { "name": "Michael Hennerich", "email": "michael.hennerich@analog.com", "time": "Wed Mar 10 15:21:24 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:32 2010 -0800" }, "message": "fbdev: bf54x-lq043fb/bfin-t350mcqb-fb: drop custom mmap() handler\n\nThe common Blackfin code implements the get_fb_unmapped_area() function,\nso we no longer need to have our own mmap() handler. The common fb code\nwill take care of everything for us now.\n\nSigned-off-by: Michael Hennerich \u003cmichael.hennerich@analog.com\u003e\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0d3580d40cc38bbaf63d0b2756931e0ae241a9ea", "tree": "f449628dd8da7ecbdefb179c59b2317ab50c23f9", "parents": [ "6e3e37a5a7c91045497553bcbd6a5faea98b21b3" ], "author": { "name": "Roel Kluin", "email": "roel.kluin@gmail.com", "time": "Wed Mar 10 15:21:23 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:32 2010 -0800" }, "message": "asiliantfb: fix test of unsigned in asiliant_calc_dclk2()\n\nFtarget, Fret, n and m are unsigned so the tests did not work.\n\nSigned-off-by: Roel Kluin \u003croel.kluin@gmail.com\u003e\nCc: Andres Salomon \u003cdilinger@debian.org\u003e\nCc: Krzysztof Helt \u003ckrzysztof.h1@poczta.fm\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5c1f96f4cffbdde9e194f3ae5373953f3fa12836", "tree": "9d6c9a552a067abf6d5a62e79fc68d0f052c899a", "parents": [ "57d54889cd00db2752994b389ba714138652e60c" ], "author": { "name": "Thomas Weber", "email": "weber@corscience.de", "time": "Wed Mar 03 09:16:54 2010 +0100" }, "committer": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Wed Mar 10 13:15:45 2010 +0200" }, "message": "OMAP: DSS2: VRAM: Fix early_param for vram\n\nIn commit 2b0d8c251b8876d530a6bf671eb5425838fa698a the __early_param is\nreplaced with the generic early_param. This patch fixes the parameter passing\nfor the vram.\n\nSigned-off-by: Thomas Weber \u003cweber@corscience.de\u003e\n[tomi.valkeinen@nokia.com: changed the commit prefix]\nSigned-off-by: Tomi Valkeinen \u003ctomi.valkeinen@nokia.com\u003e\n" }, { "commit": "988addf82e4c03739375279de73929580a2d4a6a", "tree": "989ae1cd4e264bbad80c65f04480486246e7b9f3", "parents": [ "004c1c7096659d352b83047a7593e91d8a30e3c5", "25cf84cf377c0aae5dbcf937ea89bc7893db5176" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Mar 08 20:21:04 2010 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Mar 08 20:21:04 2010 +0000" }, "message": "Merge branch \u0027origin\u0027 into devel-stable\n\nConflicts:\n\tarch/arm/mach-mx2/devices.c\n\tarch/arm/mach-mx2/devices.h\n\tsound/soc/pxa/pxa-ssp.c\n" }, { "commit": "318ae2edc3b29216abd8a2510f3f80b764f06858", "tree": "ce595adde342f57f379d277b25e4dd206988a052", "parents": [ "25cf84cf377c0aae5dbcf937ea89bc7893db5176", "3e58974027b04e84f68b964ef368a6cd758e2f84" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Mar 08 16:55:37 2010 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Mar 08 16:55:37 2010 +0100" }, "message": "Merge branch \u0027for-next\u0027 into for-linus\n\nConflicts:\n\tDocumentation/filesystems/proc.txt\n\tarch/arm/mach-u300/include/mach/debug-macro.S\n\tdrivers/net/qlge/qlge_ethtool.c\n\tdrivers/net/qlge/qlge_main.c\n\tdrivers/net/typhoon.c\n" }, { "commit": "c2e13037e6794bd0d9de3f9ecabf5615f15c160b", "tree": "932ed7dd76eaf0442bd7288613a274355e343965", "parents": [ "1b07193b34c1bc1c184e2d53a62633a73ea9b0a0" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Thu Feb 04 20:56:51 2010 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Sun Mar 07 17:04:50 2010 -0800" }, "message": "platform-drivers: move probe to .devinit.text in drivers/video\n\nA pointer to a probe callback is passed to the core via\nplatform_driver_register and so the function must not disappear when the\n.init sections are discarded. Otherwise (if also having HOTPLUG\u003dy)\nunbinding and binding a device to the driver via sysfs will result in an\noops as does a device being registered late.\n\nAn alternative to this patch is using platform_driver_probe instead of\nplatform_driver_register plus removing the pointer to the probe function\nfrom the struct platform_driver.\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nCc: Adrian Bunk \u003cbunk@stusta.de\u003e\nCc: Alberto Mardegan \u003cmardy@users.sourceforge.net\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Andriy Skulysh \u003caskulysh@gmail.com\u003e\nCc: Antonino Daplas \u003cadaplas@gmail.com\u003e\nCc: Anton Vorontsov \u003cavorontsov@ru.mvista.com\u003e\nCc: Ben Dooks \u003cben-linux@fluff.org\u003e\nCc: Chandramouli Narayanan \u003cmouli@linux.intel.com\u003e\nCc: Christoph Hellwig \u003chch@lst.de\u003e\nCc: Frans Pop \u003celendil@planet.nl\u003e\nCc: Geert Uytterhoeven \u003cGeert.Uytterhoeven@sonycom.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nCc: Helge Deller \u003cdeller@gmx.de\u003e\nCc: Huang Ying \u003cying.huang@intel.com\u003e\nCc: Ian Molton \u003cspyro@f2s.com\u003e\nCc: Joshua Kinard \u003ckumba@gentoo.org\u003e\nCc: Kaj-Michael Lang \u003cmilang@tal.org\u003e\nCc: Krzysztof Helt \u003ckrzysztof.h1@poczta.fm\u003e\nCc: linux-fbdev-devel@lists.sourceforge.net\nCc: Maciej W. Rozycki \u003cmacro@linux-mips.org\u003e\nCc: Magnus Damm \u003cdamm@igel.co.jp\u003e\nCc: Martin Michlmayr \u003ctbm@cyrius.com\u003e\nCc: Matthias Kaehlcke \u003cmatthias@kaehlcke.net\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Pavel Machek \u003cpavel@suse.cz\u003e\nCc: Philipp Zabel \u003cphilipp.zabel@gmail.com\u003e\nCc: Richard Purdie \u003crpurdie@rpsys.net\u003e\nCc: Roel Kluin \u003croel.kluin@gmail.com\u003e\nCc: Roland Stigge \u003cstigge@antcom.de\u003e\nCc: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nCc: Thomas Bogendoerfer \u003ctsbogend@alpha.franken.de\u003e\nCc: Vincent Sanders \u003cvince@simtec.co.uk\u003e\nCc: Yoichi Yuasa \u003cyoichi_yuasa@tripeaks.co.jp\u003e\nAcked-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nAcked-by: Arnaud Patard \u003carnaud.patard@rtp-net.org\u003e\nAcked-by: James Simmons \u003cjsimmons@infradead.org\u003e\nAcked-by: Peter Jones \u003cpjones@redhat.com\u003e\nAcked-by: Jaya Kumar \u003cjayakumar.lkml@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "52cf25d0ab7f78eeecc59ac652ed5090f69b619e", "tree": "031d1ffb3890bd69c0260c864c512e0be62ac05c", "parents": [ "6c1733aca0b48db4d0e660d54976a1cca25b5eaf" ], "author": { "name": "Emese Revfy", "email": "re.emese@gmail.com", "time": "Tue Jan 19 02:58:23 2010 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Sun Mar 07 17:04:49 2010 -0800" }, "message": "Driver core: Constify struct sysfs_ops in struct kobj_type\n\nConstify struct sysfs_ops.\n\nThis is part of the ops structure constification\neffort started by Arjan van de Ven et al.\n\nBenefits of this constification:\n\n * prevents modification of data that is shared\n (referenced) by many other structure instances\n at runtime\n\n * detects/prevents accidental (but not intentional)\n modification attempts on archs that enforce\n read-only kernel data at runtime\n\n * potentially better optimized code as the compiler\n can assume that the const data cannot be changed\n\n * the compiler/linker move const data into .rodata\n and therefore exclude them from false sharing\n\nSigned-off-by: Emese Revfy \u003cre.emese@gmail.com\u003e\nAcked-by: David Teigland \u003cteigland@redhat.com\u003e\nAcked-by: Matt Domsch \u003cMatt_Domsch@dell.com\u003e\nAcked-by: Maciej Sosnowski \u003cmaciej.sosnowski@intel.com\u003e\nAcked-by: Hans J. Koch \u003chjk@linutronix.de\u003e\nAcked-by: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nAcked-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\nAcked-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "4f811ef0d40048ae80b6ea77080b814725bffc58", "tree": "497168c5c8059bed17c50c8b44d9691e5634f8bb", "parents": [ "1ad998934e9c6cbae91662a05e0cb8772b1f4f75" ], "author": { "name": "Haojian Zhuang", "email": "haojian.zhuang@marvell.com", "time": "Fri Dec 18 10:01:45 2009 -0500" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Sun Mar 07 22:17:08 2010 +0100" }, "message": "backlight: Enable max8925 backlight\n\nEnable max8925 backlight sub device.\n\nSigned-off-by: Haojian Zhuang \u003chaojian.zhuang@marvell.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "d07e8bf83fd71567aaf9c27c3b133ab3cf8f3c4c", "tree": "bee15dd7e54f3d391d9d29dcd7182eea32615d2b", "parents": [ "a16122bcacf050e7f83015183053cf799713cc37" ], "author": { "name": "Haojian Zhuang", "email": "haojian.zhuang@marvell.com", "time": "Mon Nov 09 12:41:07 2009 -0500" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Sun Mar 07 22:17:04 2010 +0100" }, "message": "backlight: Enable backlight in 88pm860x\n\nAt most, three backlight device can be supported in 88pm860x driver.\n\nSigned-off-by: Haojian Zhuang \u003chaojian.zhuang@marvell.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "6aed359df4d82c38145d95957b741f0b08d24074", "tree": "899d117b7c4ab44233c4303454355b1f3069b90c", "parents": [ "a52712af5a7473b9f85d8499153f4bbfe875f942" ], "author": { "name": "Thiago Farina", "email": "tfransosi@gmail.com", "time": "Fri Mar 05 13:44:17 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 06 11:26:46 2010 -0800" }, "message": "console/vgacon.c: mark file-local symbol static\n\nwarning: symbol \u0027vgacon_text_mode_force\u0027 was not declared. Should it be static?\n\nSigned-off-by: Thiago Farina \u003ctfransosi@gmail.com\u003e\nAcked-by: Matthew Garrett \u003cmjg@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a52712af5a7473b9f85d8499153f4bbfe875f942", "tree": "ca689c75666e488d57108da00a1d429305a5771b", "parents": [ "76595f79d76fbe6267a51b3a866a028d150f06d4" ], "author": { "name": "Amerigo Wang", "email": "amwang@redhat.com", "time": "Fri Mar 05 13:44:17 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 06 11:26:46 2010 -0800" }, "message": "console: limit the range of VGACON_SOFT_SCROLLBACK_SIZE\n\nBuraphaLinux reported that we will trigger a mm warning when we\nCONFIG_VGACON_SOFT_SCROLLBACK_SIZE\u003d65536, this is because mm cann\u0027t\nallocate so many pages. We should limit the range of\nCONFIG_VGACON_SOFT_SCROLLBACK_SIZE, don\u0027t give a user any chance to\ntrigger that.\n\nReported-by: BuraphaLinux Server \u003cburaphalinuxserver@gmail.com\u003e\nTested-by: BuraphaLinux Server \u003cburaphalinuxserver@gmail.com\u003e\nSigned-off-by: WANG Cong \u003camwang@redhat.com\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "03a2c4d76c9e99b80d74ab8a4f344e135a5ae44b", "tree": "7fd7940a4f87dc1ace1c1bdeb1fb0d90ac3beb13", "parents": [ "a27341cd5fcb7cf2d2d4726e9f324009f7162c00", "d424b925f7092b9d95e0a8556872349abe79d9b6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 04 07:49:37 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 04 07:49:37 2010 -0800" }, "message": "Merge branch \u0027drm-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (151 commits)\n vga_switcheroo: disable default y by new rules.\n drm/nouveau: fix *staging* driver build with switcheroo off.\n drm/radeon: fix typo in Makefile\n vga_switcheroo: fix build on platforms with no ACPI\n drm/radeon: Fix printf type warning in 64bit system.\n drm/radeon/kms: bump the KMS version number for square tiling support.\n vga_switcheroo: initial implementation (v15)\n drm/radeon/kms: do not disable audio engine twice\n Revert \"drm/radeon/kms: disable HDMI audio for now on rv710/rv730\"\n drm/radeon/kms: do not preset audio stuff and start timer when not using audio\n drm/radeon: r100/r200 ums: block ability for userspace app to trash 0 page and beyond\n drm/ttm: fix function prototype to match implementation\n drm/radeon: use ALIGN instead of open coding it\n drm/radeon/kms: initialize set_surface_reg reg for rs600 asic\n drm/i915: Use a dmi quirk to skip a broken SDVO TV output.\n drm/i915: enable/disable LVDS port at DPMS time\n drm/i915: check for multiple write domains in pin_and_relocate\n drm/i915: clean-up i915_gem_flush_gpu_write_domain\n drm/i915: reuse i915_gpu_idle helper\n drm/i915: ensure lru ordering of fence_list\n ...\n\nFixed trivial conflicts in drivers/gpu/vga/Kconfig\n" }, { "commit": "b93a4afcff7be859e30cad2a305731516057d6cf", "tree": "fb5fe55864e16527e453efd18790a34db22ee2a1", "parents": [ "62c132a8008991530839401674ce8e1b12b005d3", "9b1489e989695c4d502865f8bec616c0f17e99ab" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Mar 02 23:29:32 2010 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Tue Mar 02 23:29:32 2010 +0000" }, "message": "Merge branch \u0027for-rmk\u0027 of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable\n\nConflicts:\n\tarch/arm/Makefile\n" }, { "commit": "3a5b27bf6f29574d667230c7e76e4b83fe3014e0", "tree": "a80892424269083c292d3eee29c4b3e6289d588b", "parents": [ "5057bfaff82e12f01a2ffd58f55535cbd7c5c3a2", "21df20fcfb4e88f4cd4991e9e67de549e6480adf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 02 10:41:26 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 02 10:41:26 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://gitorious.org/linux-omap-dss2/linux\n\n* \u0027for-linus\u0027 of git://gitorious.org/linux-omap-dss2/linux: (49 commits)\n OMAP: DSS2: Taal: Fix TE when resuming\n OMAP: DSS2: Taal: Fix ESD check\n OMAP: DSS2: OMAPFB: Constify some function parameters\n OMAP: DSS2: OMAPFB: install omapfb.h\n OMAP: DSS2: DSI: add error prints\n OMAP: DSS2: TPO-TD03MTEA1: fix function names\n OMAP: DSS2: DSI: add dsi_vc_dcs_read_2() helper\n OMAP: DSS2: OMAPFB: Remove FB_OMAP2_FORCE_AUTO_UPDATE\n OMAP: DSS2: DSI: remove external TE support\n OMAP: DSS2: move timing functions\n OMAP: DSS2: move set/get_wss()\n OMAP: DSS2: move enable/disable/suspend/resume\n OMAP: DSS2: move update() and sync()\n OMAP: DSS2: move set/get_update_mode()\n OMAP: DSS2: move enable/get_te()\n OMAP: DSS2: move get_recommended_bpp()\n OMAP: DSS2: move get_resolution()\n OMAP: DSS2: move enable/disable_channel to overlay manager\n OMAP: DSS2: move wait_vsync()\n OMAP: DSS2: move get/set_rotate()\n ...\n" }, { "commit": "b7f3a209e9b09b3110ea084836c75f2cd26b29f2", "tree": "b5f77cb3f2eab58a2a2f3705fdd08bd39ea02a3f", "parents": [ "6d6b89bd2e316b78d668f761d380837b81fa71ef", "4b17764737bb4ee3364b8bfa2059f51ebc19ccd6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 02 07:56:44 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 02 07:56:44 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6:\n sparc: Support show_unhandled_signals.\n sparc: use __ratelimit\n sunxvr500: Additional PCI id for sunxvr500 driver\n sparc: use asm-generic/scatterlist.h\n sparc64: If \u0027slot-names\u0027 property exist, create sysfs PCI slot information.\n sparc: remove trailing space in messages\n sparc: remove redundant return statements\n" }, { "commit": "21df20fcfb4e88f4cd4991e9e67de549e6480adf", "tree": "e75764923d09f257dae21c913dcdfe10431e20db", "parents": [ "1189b7ff6485ebf1039440c34150360fab7cfb01" ], "author": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Tue Mar 02 12:13:55 2010 +0200" }, "committer": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Tue Mar 02 17:24:18 2010 +0200" }, "message": "OMAP: DSS2: Taal: Fix TE when resuming\n\nTE was not initialized properly on power on, which broke TE when resuming\nfrom suspend.\n\nSigned-off-by: Tomi Valkeinen \u003ctomi.valkeinen@nokia.com\u003e\n" }, { "commit": "1189b7ff6485ebf1039440c34150360fab7cfb01", "tree": "36bfaf20278ad00f6a76c2afe9f82c9040de4abe", "parents": [ "a4c1a148a0c4c690b95938e9577be9e461bc5e5a" ], "author": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Mon Mar 01 13:52:10 2010 +0200" }, "committer": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Mon Mar 01 14:22:57 2010 +0200" }, "message": "OMAP: DSS2: Taal: Fix ESD check\n\nUsing taal_enable_te() when DSI bus was locked caused a deadlock.\n\nSigned-off-by: Tomi Valkeinen \u003ctomi.valkeinen@nokia.com\u003e\n" }, { "commit": "a4c1a148a0c4c690b95938e9577be9e461bc5e5a", "tree": "b67323ce5ee85efce697e36d77863632f1de5e82", "parents": [ "d2e82add832f9c95376d004d565c5e164c99b9ec" ], "author": { "name": "Ville Syrjälä", "email": "ville.syrjala@nokia.com", "time": "Tue Feb 23 23:36:26 2010 +0100" }, "committer": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Mon Mar 01 13:23:26 2010 +0200" }, "message": "OMAP: DSS2: OMAPFB: Constify some function parameters\n\nSigned-off-by: Ville Syrjälä \u003cville.syrjala@nokia.com\u003e\nSigned-off-by: Tomi Valkeinen \u003ctomi.valkeinen@nokia.com\u003e\n" }, { "commit": "6a9ee8af344e3bd7dbd61e67037096cdf7f83289", "tree": "07cdb493a790cf45bc473f2fc2ea1b9a166d5191", "parents": [ "9fd1de52945e06ed88a440c99ca92dab74b9b33c" ], "author": { "name": "Dave Airlie", "email": "airlied@linux.ie", "time": "Mon Feb 01 15:38:10 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Mar 01 16:20:37 2010 +1000" }, "message": "vga_switcheroo: initial implementation (v15)\n\nMany new laptops now come with 2 gpus, one to be used for low power\nmodes and one for gaming/on-ac applications. These GPUs are typically\nwired to the laptop panel and VGA ports via a multiplexer unit which\nis controlled via ACPI methods.\n\n4 combinations of systems typically exist - with 2 ACPI methods.\nIntel/ATI - Lenovo W500/T500 - use ATPX ACPI method\nATI/ATI - some ASUS - use ATPX ACPI Method\nIntel/Nvidia - - use _DSM ACPI method\nNvidia/Nvidia - - use _DSM ACPI method.\n\nTODO:\nThis patch adds support for the ATPX method and initial bits\nfor the _DSM methods that need to written by someone with\naccess to the hardware.\nAdd a proper non-debugfs interface - need to get some proper\ntesting first.\n\nv2: add power up/down support for both devices\non W500 puts i915/radeon into D3 and cuts power to radeon.\n\nv3: redo probing methods, no DMI list, drm devices call to\nregister with switcheroo, it tries to find an ATPX method on\nany device and once there is two devices + ATPX it inits the\nswitcher.\n\nv4: ATPX msg handling using buffers - should work on more machines\n\nv5: rearchitect after more mjg59 discussion - move ATPX handling to\n radeon driver.\n\nv6: add file headers + initial nouveau bits (to be filled out).\n\nv7: merge delayed switcher code.\n\nv8: avoid suspend/resume of gpu that is off\n\nv9: rearchitect - mjg59 is always right. - move all ATPX code to\nradeon, should allow simpler DSM also proper ATRM handling\n\nv10: add ATRM support for radeon BIOS, add mutex to lock vgasr_priv\n\nv11: fix bug in resuming Intel for 2nd time.\n\nv12: start fixing up nvidia code blindly.\n\nv13: blindly guess at finishing nvidia code\n\nv14: remove radeon audio hacks - fix up intel resume more like upstream\n\nv15: clean up printks + remove unnecessary igd/dis pointers\n\nmount debugfs\n\n/sys/kernel/debug/vgaswitcheroo/switch - should exist if ATPX detected\n + 2 cards.\n\nDIS - immediate change to discrete\nIGD - immediate change to IGD\nDDIS - delayed change to discrete\nDIGD - delayed change to IGD\nON - turn on not in use\nOFF - turn off not in use\n\nTested on W500 (Intel/ATI) and T500 (Intel/ATI)\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "847f9c606cad121cebf984639e3eeee1c4db82f8", "tree": "ecd7aaef6cdfaf908d4d37db2e8f1951b490543a", "parents": [ "7981164791d18d5ed1dcdfa9598949ed158a5333", "00ebfe58b002f0ff387f60c7cd23bc2b274fce1a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 27 16:22:47 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 27 16:22:47 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (24 commits)\n m68k: Define sigcontext ABI of ColdFire\n m68knommu: NPTL support for uClinux\n m68k: Add NPTL support\n m68k: Eliminate unused variable in page_to_phys()\n m68k: Switch to generic siginfo layout\n macfb: fix 24-bit visual and stuff\n macfb: cleanup\n fbdev: add some missing mac modes\n mac68k: start CUDA early\n valkyriefb: various fixes\n fbdev: mac_var_to_mode() fix\n mac68k: move macsonic and macmace platform devices\n mac68k: move mac_esp platform device\n mac68k: replace mac68k SCC code with platform device\n pmac-zilog: add platform driver\n pmac-zilog: cleanup\n mac68k: rework SWIM platform device\n mac68k: cleanup\n ataflop: Killl warning about unused variable flags\n m68k: Use DIV_ROUND_CLOSEST\n ...\n" }, { "commit": "ef1a8de8ea004a689b2aa9f5cefcba2b1a0262f2", "tree": "14324fad5e33c50c7d00646b7f6d2524943e7726", "parents": [ "1c32fd0c5ac1ccbdc37a1a392a5d75cbe059b401", "3d98ffbffb16f2a1569b83cb78db0b5100e6c937" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 27 13:26:18 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Feb 27 13:26:18 2010 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (88 commits)\n powerpc: Fix lwsync feature fixup vs. modules on 64-bit\n powerpc: Convert pmc_owner_lock to raw_spinlock\n powerpc: Convert die.lock to raw_spinlock\n powerpc: Convert tlbivax_lock to raw_spinlock\n powerpc: Convert mpic locks to raw_spinlock\n powerpc: Convert pmac_pic_lock to raw_spinlock\n powerpc: Convert big_irq_lock to raw_spinlock\n powerpc: Convert feature_lock to raw_spinlock\n powerpc: Convert i8259_lock to raw_spinlock\n powerpc: Convert beat_htab_lock to raw_spinlock\n powerpc: Convert confirm_error_lock to raw_spinlock\n powerpc: Convert ipic_lock to raw_spinlock\n powerpc: Convert native_tlbie_lock to raw_spinlock\n powerpc: Convert beatic_irq_mask_lock to raw_spinlock\n powerpc: Convert nv_lock to raw_spinlock\n powerpc: Convert context_lock to raw_spinlock\n powerpc/85xx: Add NOR, LEDs and PIB support for MPC8568E-MDS boards\n powerpc/86xx: Enable VME driver on the GE SBC610\n powerpc/86xx: Enable VME driver on the GE PPC9A\n powerpc/86xx: Add MSI section to GE PPC9A DTS\n ...\n" }, { "commit": "99e11ab20b26b3236490ae687ab309c2601d180b", "tree": "e44e01130117c9a17801bfc2c3434a2d3fd9275f", "parents": [ "34c41d0ab8c2a96bb3db89a209c1dd7e8c44fe13" ], "author": { "name": "Finn Thain", "email": "fthain@telegraphics.com.au", "time": "Wed Nov 04 00:51:18 2009 +1100" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sat Feb 27 18:31:16 2010 +0100" }, "message": "macfb: fix 24-bit visual and stuff\n\nLots of changes. Remove volatile keywords. Take the advice in the comments\nand change video_slot to slot_addr. Factor out fifteen or so \"channel \u003e\u003e\n8\" shifts into three shifts higher up the call graph. Make\ncsc_setpalette() atomic, pass the correct color values. Check for\nioremap() failure. Add missing break statement, thus fixing 24 bit console\nvisual (blue background bug). Remove some uninformative printk() noise.\nAdd a description for powerbook 140/170 graphics.\n\nSigned-off-by: Finn Thain \u003cfthain@telegraphics.com.au\u003e\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "34c41d0ab8c2a96bb3db89a209c1dd7e8c44fe13", "tree": "bc84cce98b2375c058403a78da541a686b6bfa69", "parents": [ "1bb63845d122750124807e5aeb733d2276e5fb7d" ], "author": { "name": "Finn Thain", "email": "fthain@telegraphics.com.au", "time": "Wed Nov 04 00:47:28 2009 +1100" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sat Feb 27 18:31:15 2010 +0100" }, "message": "macfb: cleanup\n\nCleanup whitespace and code style. Remove unused #includes and prototypes.\nRemove obsolete, redundant or misleading comments. Remove dead code and\nredundant initialisers.\n\nSigned-off-by: Finn Thain \u003cfthain@telegraphics.com.au\u003e\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "1bb63845d122750124807e5aeb733d2276e5fb7d", "tree": "433169c5c9c398dee00d7eaf73f8114fc9caf4e0", "parents": [ "18814ee846357509ceb13d4351eec71acd007480" ], "author": { "name": "Finn Thain", "email": "fthain@telegraphics.com.au", "time": "Wed Nov 04 00:47:02 2009 +1100" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sat Feb 27 18:31:14 2010 +0100" }, "message": "fbdev: add some missing mac modes\n\nAdd the missing mac video modes for the Portrait and 12\" RGB displays. The\nspecs come from the Mac LC III developer note.\n\nSigned-off-by: Finn Thain \u003cfthain@telegraphics.com.au\u003e\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "11e8faca2e501c25d2f98c1b9534776a9a9704c5", "tree": "0f98adbc0b0880e5fc88d47a02c0c39f6f5085bd", "parents": [ "d876c11a0fd40993136f5cc1e81371ccc6c21a63" ], "author": { "name": "Finn Thain", "email": "fthain@telegraphics.com.au", "time": "Wed Nov 04 00:43:52 2009 +1100" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sat Feb 27 18:31:13 2010 +0100" }, "message": "valkyriefb: various fixes\n\nValkyriefb and macfb will adopt the same card if they get the chance, so\nremove valkyrie support from macfb. Also fix the \"valkyriefb: can\u0027t do\n832x624x8\" problem reported by Raylynn Knight some time ago, by adding\nvmode 13 support for CONFIG_MAC. Also add vmode 11 since that works too.\nMake use of the monitor sense lines on 68k Macs too. Also some cleanups.\n\nSigned-off-by: Finn Thain \u003cfthain@telegraphics.com.au\u003e\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "d876c11a0fd40993136f5cc1e81371ccc6c21a63", "tree": "d2f09796146f4d8a61499759191e4cb832b1984c", "parents": [ "eeb9c182a6ad8bc130377adb0a4cd7b95dd15f49" ], "author": { "name": "Finn Thain", "email": "fthain@telegraphics.com.au", "time": "Wed Nov 04 00:43:16 2009 +1100" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sat Feb 27 18:31:12 2010 +0100" }, "message": "fbdev: mac_var_to_mode() fix\n\nThe valkyriefb driver assumes that this logic holds:\n\nmac_vmode_to_var(X, cmode, \u0026var);\nmac_var_to_vmode(\u0026var, \u0026vmode, \u0026cmode);\nassert(vmode \u003d\u003d X);\n\nBut it doesn\u0027t hold because mac_var_to_vmode() can return a mode with a\nslower pixel clock, even when a match is available. So we end up with this\nfailure:\n\nusing video mode 11 and color mode 0.\nvalkyriefb: vmode 12 not valid.\nvalkyriefb: can\u0027t set default video mode\nvalkyriefb: vmode 12 not valid.\n\nRather than have mac_var_to_mode() return the first reasonable mode it\nfinds, have it return the mode that is closest to the requested one (or\nthe mode with the closest longer pixel clock period if there is no exact\nmatch).\n\nSigned-off-by: Finn Thain \u003cfthain@telegraphics.com.au\u003e\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "64d497f55379b1e320a08ec2426468d96f5642ec", "tree": "22b9ab3c5e69c5cc2728cbc2ca7fc7623beef8f1", "parents": [ "37d4008484977f60d5d37499a2670c79b214dd46", "b5f5fe80fa98a60daa0fa94512d1599b1e26674c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 26 16:54:27 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Feb 26 16:54:27 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (187 commits)\n sh: remove dead LED code for migo-r and ms7724se\n sh: ecovec build fix for CONFIG_I2C\u003dn\n sh: ecovec r-standby support\n sh: ms7724se r-standby support\n sh: SH-Mobile R-standby register save/restore\n clocksource: Fix up a registration/IRQ race in the sh drivers.\n sh: ms7724: modify scan_timing for KEYSC\n sh: ms7724: Add sh_sir support\n sh: mach-ecovec24: Add sh_sir support\n sh: wire up SET/GET_UNALIGN_CTL.\n sh: allow alignment fault mode to be configured at kernel boot.\n sh: sh7724: Update FSI/SPU2 clock\n sh: always enable sh7724 vpu_clk and set to 166MHz on Ecovec\n sh: add sh7724 kick callback to clk_div4_table\n sh: introduce struct clk_div4_table\n sh: clock-cpg div4 set_rate() shift fix\n sh: Turn on speculative return for SH7785 and SH7786\n sh: Merge legacy and dynamic PMB modes.\n sh: Use uncached I/O helpers in PMB setup.\n sh: Provide uncached I/O helpers.\n ...\n" }, { "commit": "5d68e0326b146f28fbb8fe6375dd7d15ca929be7", "tree": "4190a41f4306e17bdbc1ff8146ad323f25b43265", "parents": [ "606847540079bd3e710f132724145c5785396dcb" ], "author": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Fri Feb 26 11:32:56 2010 +0200" }, "committer": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Fri Feb 26 17:44:10 2010 +0200" }, "message": "OMAP: DSS2: DSI: add error prints\n\nAdd error printing for dsi_vc_dcs_write() and dsi_vc_dcs_read().\n\nSigned-off-by: Tomi Valkeinen \u003ctomi.valkeinen@nokia.com\u003e\n" }, { "commit": "275143e9b237dd7e0b6d01660fd9b8acd9922fa7", "tree": "23264f8758a164b4e402195f173aa7fa16b37a99", "parents": [ "a6d468d05356655cdc11bb2cfec4e64bcef6ad0a" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Fri Feb 26 04:37:09 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 26 04:37:09 2010 -0800" }, "message": "sunxvr500: Additional PCI id for sunxvr500 driver\n\nIntergraph bought 3D Labs and some XVR-500 chips have Intergraph\u0027s\nvendor id.\n\nReported-by: Jurij Smakov \u003cjurij@wooyd.org\u003e\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nCc: stable@kernel.org\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "606847540079bd3e710f132724145c5785396dcb", "tree": "ca902c4a9f0cacfe9d4ea8ba943433d58c50e4b7", "parents": [ "53055aae2048214cbec1f5f7f8846f9dff12b2bc" ], "author": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Tue Feb 09 14:14:07 2010 +0200" }, "committer": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Fri Feb 26 11:34:24 2010 +0200" }, "message": "OMAP: DSS2: TPO-TD03MTEA1: fix function names\n\nCopy/paste had resulted in wrong function names in TPO TD043MTEA1 panel\ndriver.\n\nSigned-off-by: Tomi Valkeinen \u003ctomi.valkeinen@nokia.com\u003e\n" }, { "commit": "874f2f997dbe041a6c6e509dae8656ed9022d65d", "tree": "61898165882041ef7f9beaf2ef6663a1a4d3c29a", "parents": [ "071c06cb570d38efe23a124e885f2f3e643a9206", "6ebdc661b608671e9ca572af8bb42d58108cc008" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Fri Feb 26 14:41:00 2010 +1100" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Fri Feb 26 14:41:00 2010 +1100" }, "message": "Merge commit \u0027origin/master\u0027 into next\n\nManual merge of:\n\tdrivers/char/hvc_console.c\n\tdrivers/char/hvc_console.h\n" }, { "commit": "6ebdc661b608671e9ca572af8bb42d58108cc008", "tree": "e99caacb964a27caeae699160fa5eddcb14526e9", "parents": [ "d7930c9ef9cc67044f5ddaac54d06ca22645a012", "df0edeb59eb559be0bee53452fda2f5cc0ae133f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 25 15:38:37 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Feb 25 15:38:37 2010 -0800" }, "message": "Merge branch \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6: (41 commits)\n of: remove undefined request_OF_resource \u0026 release_OF_resource\n of/sparc: Remove sparc-local declaration of allnodes and devtree_lock\n of: move definition of of_chosen into common code.\n of: remove unused extern reference to devtree_lock\n of: put default string compare and #a/s-cell values into common header\n of/flattree: Don\u0027t assume HAVE_LMB\n of: protect linux/of.h with CONFIG_OF\n proc_devtree: fix THIS_MODULE without module.h\n of: Remove old and misplaced function declarations\n of/flattree: Make the kernel accept ePAPR style phandle information\n of/flattree: endian-convert members of boot_param_header\n of: assume big-endian properties, adding conversions where necessary\n of: use __be32 for cell value accessors\n of/flattree: use OF_ROOT_NODE_{SIZE,ADDR}_CELLS DEFAULT for fdt parsing\n of/flattree: use callback to setup initrd from /chosen\n proc_devtree: include linux/of.h\n of: make set_node_proc_entry private to proc_devtree.c\n of: include linux/proc_fs.h\n of/flattree: merge early_init_dt_scan_memory() common code\n of: add \u0027of_\u0027 prefix to machine_is_compatible()\n ...\n" }, { "commit": "53055aae2048214cbec1f5f7f8846f9dff12b2bc", "tree": "0cc2387f2cbf7050d994b4f57b5b6c1584e52589", "parents": [ "ddbfeb396eb085e17f5aa830a151d546f16cb868" ], "author": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Thu Feb 25 11:38:13 2010 +0200" }, "committer": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Thu Feb 25 18:28:41 2010 +0200" }, "message": "OMAP: DSS2: DSI: add dsi_vc_dcs_read_2() helper\n\nAdd dsi_vc_dcs_read_2() helper function to read two bytes from the DSI\nperipheral.\n\nSigned-off-by: Tomi Valkeinen \u003ctomi.valkeinen@nokia.com\u003e\n" }, { "commit": "9fd1de52945e06ed88a440c99ca92dab74b9b33c", "tree": "1bc5bd669ae351bf5faf741cffdab141c13ee749", "parents": [ "60b341b778cc2929df16c0a504c91621b3c6a4ad" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Feb 25 14:05:09 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Feb 25 14:15:12 2010 +1000" }, "message": "fb: for framebuffer handover don\u0027t exit the loop early.\n\nAn offb machine has been seen in the fields which adds two\noffb nodes, so continue scanning the list after removing one.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ddbfeb396eb085e17f5aa830a151d546f16cb868", "tree": "d39040e33d3f6d944ad53a92844446ca398e494c", "parents": [ "942a91a6e04e996c32252bc6c2177f74089d7a1d" ], "author": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Wed Feb 17 15:01:50 2010 +0200" }, "committer": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Wed Feb 24 14:31:28 2010 +0200" }, "message": "OMAP: DSS2: OMAPFB: Remove FB_OMAP2_FORCE_AUTO_UPDATE\n\nRemove the option for forcing auto-update. Auto-update for manual update\ndisplays is no more a DSS feature, so if a particular display devices does\nhave auto-update mode, it should be in display\u0027s custom settings.\n\nSigned-off-by: Tomi Valkeinen \u003ctomi.valkeinen@nokia.com\u003e\n" }, { "commit": "942a91a6e04e996c32252bc6c2177f74089d7a1d", "tree": "0ee0acd1f3c4b67521cb45370635afeb3c0f0e0a", "parents": [ "69b2048f44ead2d278e25d12adf0494b469ffb1c" ], "author": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Wed Feb 10 17:27:39 2010 +0200" }, "committer": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Wed Feb 24 14:31:28 2010 +0200" }, "message": "OMAP: DSS2: DSI: remove external TE support\n\nWith the reworked model, DSI driver doesn\u0027t need to know anything about\nexternal TE lines. Thus we can remove ext_te support, and only leave the\nDSI TE trigger support.\n\nSigned-off-by: Tomi Valkeinen \u003ctomi.valkeinen@nokia.com\u003e\n" }, { "commit": "69b2048f44ead2d278e25d12adf0494b469ffb1c", "tree": "3f2b462aa04ecd131d2fb4936e61c59a75a5a50c", "parents": [ "3651131268d7eae63efdffe6fa4a361abd44d747" ], "author": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Wed Jan 20 12:11:25 2010 +0200" }, "committer": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Wed Feb 24 14:31:28 2010 +0200" }, "message": "OMAP: DSS2: move timing functions\n\nMove check/set/get_timings() from omap_dss_device to omap_dss_driver.\n\nThis is part of a larger patch-set, which moves the control from omapdss\ndriver to the display driver.\n\nSigned-off-by: Tomi Valkeinen \u003ctomi.valkeinen@nokia.com\u003e\n" }, { "commit": "3651131268d7eae63efdffe6fa4a361abd44d747", "tree": "9ef7a38028cc1763c8ff895aeba8ae40ffb5c572", "parents": [ "37ac60e414052f1d9301368437db8f0cb9e323fe" ], "author": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Tue Jan 19 15:53:16 2010 +0200" }, "committer": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Wed Feb 24 14:31:28 2010 +0200" }, "message": "OMAP: DSS2: move set/get_wss()\n\nMove set/get_wss() from omap_dss_device to omap_dss_driver.\n\nThis is part of a larger patch-set, which moves the control from omapdss\ndriver to the display driver.\n\nSigned-off-by: Tomi Valkeinen \u003ctomi.valkeinen@nokia.com\u003e\n" }, { "commit": "37ac60e414052f1d9301368437db8f0cb9e323fe", "tree": "d6b30b58deae82a6d5f2ac2f4d9cf18ed3bc57da", "parents": [ "18946f62c6cc8cf051bafca8b7fa72309e8a1067" ], "author": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Tue Jan 12 15:12:07 2010 +0200" }, "committer": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Wed Feb 24 14:31:28 2010 +0200" }, "message": "OMAP: DSS2: move enable/disable/suspend/resume\n\nMove enable/disable/suspend/resume from omap_dss_device to\nomap_dss_driver.\n\nThis is part of a larger patch-set, which moves the control from omapdss\ndriver to the display driver.\n\nSigned-off-by: Tomi Valkeinen \u003ctomi.valkeinen@nokia.com\u003e\n" }, { "commit": "18946f62c6cc8cf051bafca8b7fa72309e8a1067", "tree": "f1e33d76a571ebc4580b15c1b7ba1bec8e441cf6", "parents": [ "446f7bff703f5f82560afde90fb22b7a1d366bbc" ], "author": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Tue Jan 12 14:16:41 2010 +0200" }, "committer": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Wed Feb 24 14:31:28 2010 +0200" }, "message": "OMAP: DSS2: move update() and sync()\n\nMove update() and sync() from omap_dss_device to omap_dss_driver.\n\nAlso, update was hardcoded to use virtual channel 0. This patch adds a\nparameter that specifies the VC.\n\nThis is part of a larger patch-set, which moves the control from omapdss\ndriver to the display driver.\n\nSigned-off-by: Tomi Valkeinen \u003ctomi.valkeinen@nokia.com\u003e\n" }, { "commit": "446f7bff703f5f82560afde90fb22b7a1d366bbc", "tree": "6ed3d56bbe170c8491e77734822fbcd8f07fbe0c", "parents": [ "225b650d41e7cdbf5cd322a461b04493caabed09" ], "author": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Mon Jan 11 16:12:31 2010 +0200" }, "committer": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Wed Feb 24 14:31:28 2010 +0200" }, "message": "OMAP: DSS2: move set/get_update_mode()\n\nMove set/get_update_mode() from omap_dss_device to omap_dss_driver.\n\nThis is part of a larger patch-set, which moves the control from omapdss\ndriver to the display driver.\n\nSigned-off-by: Tomi Valkeinen \u003ctomi.valkeinen@nokia.com\u003e\n" }, { "commit": "225b650d41e7cdbf5cd322a461b04493caabed09", "tree": "dcd6b3f83036eeb13777f018aca4cf8273d087c5", "parents": [ "a269950405ab17ce3a604ddcd939709a4a7a747c" ], "author": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Mon Jan 11 15:11:01 2010 +0200" }, "committer": { "name": "Tomi Valkeinen", "email": "tomi.valkeinen@nokia.com", "time": "Wed Feb 24 14:31:27 2010 +0200" }, "message": "OMAP: DSS2: move enable/get_te()\n\nMove enable/get_te() from omap_dss_device to omap_dss_driver.\n\nThis is part of a larger patch-set, which moves the control from omapdss\ndriver to the display driver.\n\nSigned-off-by: Tomi Valkeinen \u003ctomi.valkeinen@nokia.com\u003e\n" } ], "next": "a269950405ab17ce3a604ddcd939709a4a7a747c" }