]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d04ef3a 116f232)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 22 Mar 2006 18:58:05 +0000 (10:58 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 22 Mar 2006 18:58:05 +0000 (10:58 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
  fixed path to moved file in include/linux/device.h
  Fix spelling in E1000_DISABLE_PACKET_SPLIT Kconfig description
  Documentation/dvb/get_dvb_firmware: fix firmware URL
  Documentation: Update to BUG-HUNTING
  Remove superfluous NOTIFY_COOKIE_LEN define
  add "tags" to .gitignore
  Fix "frist", "fisrt", typos
  fix rwlock usage example
  It's UTF-8

1  2 
drivers/block/cciss.c patch | diff1 | diff2 | blob | history
drivers/scsi/megaraid/megaraid_sas.c patch | diff1 | diff2 | blob | history
include/linux/device.h patch | diff1 | diff2 | blob | history

diff --cc drivers/block/cciss.c
Simple merge
diff --cc drivers/scsi/megaraid/megaraid_sas.c
Simple merge
diff --cc include/linux/device.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.