aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-linus' of ↵Linus Torvalds2010-05-20165-328/+313
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (44 commits) vlynq: make whole Kconfig-menu dependant on architecture add descriptive comment for TIF_MEMDIE task flag declaration. EEPROM: max6875: Header file cleanup EEPROM: 93cx6: Header file cleanup EEPROM: Header file cleanup agp: use NULL instead of 0 when pointer is needed rtc-v3020: make bitfield unsigned PCI: make bitfield unsigned jbd2: use NULL instead of 0 when pointer is needed cciss: fix shadows sparse warning doc: inode uses a mutex instead of a semaphore. uml: i386: Avoid redefinition of NR_syscalls fix "seperate" typos in comments cocbalt_lcdfb: correct sections doc: Change urls for sparse Powerpc: wii: Fix typo in comment i2o: cleanup some exit paths Documentation/: it's -> its where appropriate UML: Fix compiler warning due to missing task_struct declaration UML: add kernel.h include to signal.c ...
| * vlynq: make whole Kconfig-menu dependant on architectureWolfram Sang2010-05-141-1/+1
| | | | | | | | | | | | | | | | This removes an empty menu for most platforms. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Acked-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * add descriptive comment for TIF_MEMDIE task flag declaration.Andreas Dilger2010-05-1424-27/+26
| | | | | | | | | | | | Signed-off-by: Andreas Dilger <adilger@dilger.ca> Acked-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * EEPROM: max6875: Header file cleanupArce, Abraham2010-05-141-26/+26
| | | | | | | | | | | | | | | | Change max6875.c header file to format as in conventions Signed-off-by: Abraham Arce <x0066660@ti.com> Acked-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * EEPROM: 93cx6: Header file cleanupArce, Abraham2010-05-141-23/+16
| | | | | | | | | | | | | | | | Change eeprom_93cx6.c header file to format as in conventions Signed-off-by: Abraham Arce <x0066660@ti.com> Acked-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * EEPROM: Header file cleanupArce, Abraham2010-05-141-20/+16
| | | | | | | | | | | | | | | | | | Change eeprom.c header file to format as in conventions Signed-off-by: Abraham Arce <x0066660@ti.com> Acked-by: Jean Delvare <khali@linux-fr.org> Acked-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * agp: use NULL instead of 0 when pointer is neededBill Pemberton2010-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | Fixes sparse warning: drivers/char/agp/generic.c:1217:33: warning: Using plain integer as NULL pointer Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> CC: linux-kernel@vger.kernel.org Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * rtc-v3020: make bitfield unsignedBill Pemberton2010-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | Fix sparse warning: include/linux/rtc-v3020.h:18:23: error: dubious one-bit signed bitfield Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> CC: p_gortmaker@yahoo.com Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * PCI: make bitfield unsignedBill Pemberton2010-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | Fix sparse warning: drivers/pci/pci.h:247:25: error: dubious one-bit signed bitfield Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> CC: linux-pci@vger.kernel.org Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * jbd2: use NULL instead of 0 when pointer is neededBill Pemberton2010-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | Fixes sparse warning: fs/jbd2/journal.c:1892:9: warning: Using plain integer as NULL pointer Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> CC: linux-ext4@vger.kernel.org Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * cciss: fix shadows sparse warningBill Pemberton2010-05-111-2/+1
| | | | | | | | | | | | | | | | | | | | | | Fix sparse warnings: drivers/block/cciss.c:1591:37: warning: symbol 'i' shadows an earlier one drivers/block/cciss.c:2437:21: warning: symbol 'i' shadows an earlier one Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Acked-by: Mike Miller <mike.miller@hp.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * doc: inode uses a mutex instead of a semaphore.Thadeu Lima de Souza Cascardo2010-05-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the introduced i_sem by an i_mutex in the filesystem locking documentation. This was introduced [1] after all occurrences were already replaced in the same text [2]. However, the term "inode semaphore" has not been replaced then, and it's replaced now. [1] afddba49d18f346e5cc2938b6ed7c512db18ca68 [2] a7bc02f4f47fd0e7860c6589f0ad000d1476f7a3 Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com> Cc: Nick Piggin <npiggin@suse.de> Cc: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> Cc: Randy Dunlap <rdunlap@xenotime.net> Cc: Christoph Hellwig <hch@lst.de> Cc: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * uml: i386: Avoid redefinition of NR_syscallsJan Kiszka2010-05-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The i386 subarch happens to pull in original NR_syscalls. Maybe we can make that work for all host arch, but for now just avoid the clash by using an all-upper-case name. CC arch/um/kernel/skas/syscall.o/data/linux-2.6/arch/um/kernel/skas/syscall.c:13:1: warning: "NR_syscalls" redefined In file included from /data/linux-2.6/arch/x86/include/asm/unistd.h:3, from /data/linux-2.6/arch/um/sys-i386/shared/sysdep/syscalls.h:6, from /data/linux-2.6/arch/um/kernel/skas/syscall.c:10: /data/linux-2.6/arch/x86/include/asm/unistd_32.h:349:1: warning: this is the location of the previous definition Signed-off-by: Jan Kiszka <jan.kiszka@web.de> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * fix "seperate" typos in commentsAnand Gadiyar2010-05-107-14/+14
| | | | | | | | | | | | | | s/seperate/separate Signed-off-by: Anand Gadiyar <gadiyar@ti.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * cocbalt_lcdfb: correct sectionsHenrik Kretzschmar2010-05-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | Since the drivers probe call was changed from .init.text to .devinit.text in commit c2e13037e6794bd0d9de3f9ecabf5615f15c160b the fb_fix_screeninfo structure must be changed from .init.data to .devinit.data, too. Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de> Tested-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * doc: Change urls for sparseBill Pemberton2010-04-271-2/+2
| | | | | | | | | | | | | | | | The location of the sparse web page and git tree were no longer valid. This changes them to point to the current versions. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * Powerpc: wii: Fix typo in commentThomas Weber2010-04-261-2/+2
| | | | | | | | | | | | | | | | discontiguous => discontinuous coealesce => coalesce Signed-off-by: Thomas Weber <weber@corscience.de> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * i2o: cleanup some exit pathsDan Carpenter2010-04-261-10/+6
| | | | | | | | | | | | | | | | | | | | | | This is just a cleanup and doesn't change how the code works. The original code had a mix of returns and gotos so I changed everything to just return directly. Signed-off-by: Dan Carpenter <error27@gmail.com> Reviewed-by: Christoph Lameter <cl@linux-foundation.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * Documentation/: it's -> its where appropriateFrancis Galiegue2010-04-2356-81/+81
| | | | | | | | | | | | | | | | Fix obvious cases of "it's" being used when "its" was meant. Signed-off-by: Francis Galiegue <fgaliegue@gmail.com> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * Merge branch 'master' into for-nextJiri Kosina2010-04-235526-43399/+96455
| |\
| * | UML: Fix compiler warning due to missing task_struct declarationJan Kiszka2010-04-212-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't pull in linux/sched.h due to circular dependency, so just forward-declare the struct. This fixes the following warning: CC arch/um/sys-i386/elfcore.o In file included from /data/linux-2.6/include/linux/elf.h:8, from /data/linux-2.6/arch/um/sys-i386/elfcore.c:2: arch/um/sys-i386/asm/elf.h:78: warning: ‘struct task_struct’ declared inside parameter list arch/um/sys-i386/asm/elf.h:78: warning: its scope is only this definition or declaration, which is probably not what you want I guess not many people build against i386 hosts anymore, so this remained widely unnoticed. Signed-off-by: Jan Kiszka <jan.kiszka@web.de> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * | UML: add kernel.h include to signal.cJiri Kosina2010-04-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 814f75ec5a94a48 ("UML: Drop private round_down definition") dropped the private round_down() macro and makes signal.c use the one from kernel.h instead. kernel.h is implicitly included through uaccess.h -> sched.h -> kernel.h but we'd rather make this dependency explicit. Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * | Fix comment typo in percpu.hJustin P. Mattock2010-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | Fix a typo in arch/x86/include/asm/percpu.h Signed-off-by: Justin P. Mattock <justinmattock@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * | UML: Drop private round_down definitionJan Kiszka2010-04-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Already defined in kernel.h. The official version assumes that 'n' is power of two - which it is in our case. Signed-off-by: Jan Kiszka <jan.kiszka@web.de> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * | UML: Clean up asm/system.hJan Kiszka2010-04-201-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | Remove duplicates and unused prototypes. Signed-off-by: Jan Kiszka <jan.kiszka@web.de> Acked-by: WANG Cong <xiyou.wangcong@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * | UML: Remove unused variable from line driverJan Kiszka2010-04-201-1/+0
| | | | | | | | | | | | | | | | | | Signed-off-by: Jan Kiszka <jan.kiszka@web.de> Acked-by: WANG Cong <xiyou.wangcong@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * | stk17ta8: renaming e-mail corrections following split of GE Fanuc joint ventureMartyn Welch2010-04-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch corrects author and copyright notices in the stk17ta8 driver following the split-up of the GE Fanuc joint venture. Signed-off-by: Martyn Welch <martyn.welch@ge.com> Acked-by: Thomas Hommel <thomas.hommel@ge.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * | rtc: e-mail corrections following split of GE Fanuc joint ventureMartyn Welch2010-04-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | This patch corrects author and copyright notices following the split-up of the GE Fanuc joint venture. Signed-off-by: Martyn Welch <martyn.welch@ge.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * | wd7000: typo spin_unlock_irq() => spin_lock_irq()Dan Carpenter2010-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This was introduced back in 2005 at the very start of the git era by: df0ae2497ddefd72a87f3a3b34ff32455d7d4ae0 [SCSI] allow sleeping in ->eh_host_reset_handler() Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * | Remove empty comment in acpi/power.cJustin P. Mattock2010-04-011-1/+0
| | | | | | | | | | | | | | | | | | | | | Remove an empty comment. Signed-off-by: Justin P. Mattock <justinmattock@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * | Fix comment and Kconfig typos for 'require' and 'fragment'Gilles Espinasse2010-03-2914-24/+24
| | | | | | | | | | | | | | | Signed-off-by: Gilles Espinasse <g.esp@free.fr> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * | cpuset: Fix documentation punctuationGreg Thelen2010-03-251-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cpusets.txt documentation punctuation. Signed-off-by: Greg Thelen <gthelen@google.com> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Acked-by: Paul Menage <menage@google.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * | i2c: twl.h: Fix comment typos and tabThomas Weber2010-03-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in comments: - contollable => controllable - uniqe => unique Replace tab with whitespace in defines. Signed-off-by: Thomas Weber <weber@corscience.de> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * | fix comment typo in sound/pci/hda/hda_local.hJustin P. Mattock2010-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | I think this should be automatic pin instead of ping. (but could be wrong). Signed-off-by: Justin P. Mattock <justinmattock@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * | memcg: fix typo in memcg documentationGreg Thelen2010-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Updated memory.txt to be more consistent: s/swapiness/swappiness/ Signed-off-by: Greg Thelen <gthelen@google.com> Acked-by: Balbir Singh <balbir@linux.vnet.ibm.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * | hpet: x86_64 and i386 are not different code any moreJiri Kosina2010-03-181-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | hpet implementation for x86_64 and i386 is unified. Reflect this in MAINTAINERS. Acked-by: Venkatesh Pallipadi <venki@google.com> Acked-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * | kfifo: fix kerneldoc for kfifo_avail and kfifo_in_lockedViral Mehta2010-03-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Function argument is not having "len" anywhere; "len" is later used in kfifo_{in|out}. So here, it would be appropriate to say, it copies @n bytes and not @len Signed-off-by: Viral Mehta <viral.mehta@lntinfotech.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * | HPET maintainer email updateVenkatesh Pallipadi2010-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | Updating my email address in MAINTAINERS. Signed-off-by: Venkatesh Pallipadi <venki@google.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * | Fix typos in commentsThomas Weber2010-03-1629-36/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Ss]ytem => [Ss]ystem udpate => update paramters => parameters orginal => original Signed-off-by: Thomas Weber <swirl@gmx.li> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * | kobj: kref.h incorrectly describes itself as kref.c.Robert P. J. Day2010-03-151-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * | omfs: remove unused version.h includeHuang Weiyi2010-03-151-1/+0
| | | | | | | | | | | | | | | | | | Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com> Signed-off-by: Bob Copeland <me@bobcopeland.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * | powerpc/BSR: fix device_create() return value checkJani Nikula2010-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Use IS_ERR() instead of comparing to NULL. Signed-off-by: Jani Nikula <ext-jani.1.nikula@nokia.com> Acked-by: Sonny Rao <sonnyrao@us.ibm.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * | kobj: add comment and multiple inclusion protectionRobert P. J. Day2010-03-151-0/+9
| | | | | | | | | | | | | | | Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * | mm: fix typo in refill_stock() commentGreg Thelen2010-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change refill_stock() comment: s/consumt_stock()/consume_stock()/ Signed-off-by: Greg Thelen <gthelen@google.com> Acked-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * | Documentation/filesystems/proc.txt typo fix.Rob Landley2010-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | Typo fix for a filename in procfs documentation. Signed-off-by: Rob Landley <rob@landley.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| * | kconfig: util: Fix typo in commentThomas Weber2010-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | sting replaced with string Signed-off-by: Thomas Weber <weber@corscience.de> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2010-05-2086-2139/+1179
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (29 commits) pcmcia: disable PCMCIA ioctl also for ARM drivers/staging/comedi: dev_node removal (quatech_daqp_cs) drivers/staging/comedi: dev_node removal (ni_mio_cs) drivers/staging/comedi: dev_node removal (ni_labpc_cs) drivers/staging/comedi: dev_node removal (ni_daq_dio24) drivers/staging/comedi: dev_node removal (ni_daq_700) drivers/staging/comedi: dev_node removal (das08_cs) drivers/staging/comedi: dev_node removal (cb_das16_cs) pata_pcmcia: get rid of extra indirection pcmcia: remove suspend-related comment from yenta_socket.c pcmcia: call pcmcia_{read,write}_cis_mem with ops_mutex held pcmcia: remove pcmcia_add_device_lock pcmcia: update gfp/slab.h includes pcmcia: remove unused mem_op.h pcmcia: do not autoadd root PCI bus resources pcmcia: clarify alloc_io_space, move it to resource handlers pcmcia: move all pcmcia_resource_ops providers into one module pcmcia: move high level CIS access code to separate file pcmcia: dev_node removal (core) pcmcia: dev_node removal (remaining drivers) ...
| * | | pcmcia: disable PCMCIA ioctl also for ARMDominik Brodowski2010-05-171-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | As per a3f916f2c84f2b9e1d32cc0dbfe326a9e380dbfb, disable the long obsolete PCMCIA ioctl also for ARM. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| * | | drivers/staging/comedi: dev_node removal (quatech_daqp_cs)Javier Martinez Canillas2010-05-171-20/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| * | | drivers/staging/comedi: dev_node removal (ni_mio_cs)Javier Martinez Canillas2010-05-171-9/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
generated by cgit v1.1 at 2024-12-27 02:34:51 +0000