mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-06-08 08:39:36 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
ae0b82504e515fdb9bc23c0b770d2b30efd49dc9
linux/Documentation
History
Olof Johansson ae0b82504e Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into next/soc 
* 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas: (234 commits)
  ARM: shmobile: remove additional __io() macro use
  ARM: mach-shmobile: default to no earlytimer
  ARM: mach-shmobile: r8a7779 and Marzen timer rework
  ARM: mach-shmobile: r8a7740 and Bonito timer rework
  ARM: mach-shmobile: sh73a0, AG5EVM and Kota2 timer rework
  ARM: mach-shmobile: sh7372, AP4EVB and Mackerel timer rework
  ARM: mach-shmobile: sh7377 and G4EVM timer rework
  ARM: mach-shmobile: sh7367 and G3EVM timer rework
  ARM: mach-shmobile: add shmobile_earlytimer_init()
  ARM: mach-shmobile: Move sh7372 AP4EVB external clk setup
  ARM: mach-shmobile: Move sh7372 Mackerel external clk setup
  ARM: mach-shmobile: rename clk_init() to shmobile_clk_init()
  ARM: mach-shmobile: r8a7779 L2 cache support
  ARM: mach-shmobile: r8a7779 map_io and init_early update
  ARM: mach-shmobile: r8a7740 map_io and init_early update
  ARM: mach-shmobile: sh73a0 map_io and init_early update
  ARM: mach-shmobile: sh7372 map_io and init_early update
  ARM: mach-shmobile: sh7377 map_io and init_early update
  ARM: mach-shmobile: sh7367 map_io and init_early update
  sh: remove clk_ops
  ...

  (includes an update to v3.3-rc7)

Conflicts:
	arch/arm/mach-omap2/id.c
2012-03-13 17:38:09 -07:00
..
ABI
Merge tag 'for-linus' of git://github.com/rustyrussell/linux
2012-01-14 12:32:16 -08:00
accounting
Documentation: update cgroupfs mount point
2011-06-15 21:52:50 -07:00
acpi
acpi/apei/einj: Add extensions to EINJ from rev 5.0 of acpi spec
2012-01-18 01:14:17 -05:00
aoe
Documentation: update broken web addresses.
2010-08-04 15:21:40 +02:00
arm
ARM: move iotable mappings within the vmalloc region
2011-11-26 19:21:26 -05:00
auxdisplay
includecheck fix: Documentation, cfag12864b-example.c
2009-09-24 07:20:57 -07:00
blackfin
doc: fix broken references
2011-09-27 18:08:04 +02:00
block
Documentation: drop as block elevator reference in switching-sched.txt
2011-11-04 12:01:48 -07:00
blockdev
cciss: auto engage SCSI mid layer at driver load time
2011-11-16 09:21:49 +01:00
cdrom
doc: fix broken references
2011-09-27 18:08:04 +02:00
cgroups
memcg: fix pgpgin/pgpgout documentation
2012-01-12 20:13:06 -08:00
connector
Documentation/: it's -> its where appropriate
2010-04-23 02:09:52 +02:00
console
doc: fix console doc typo
2010-02-24 13:51:32 +01:00
cpu-freq
Doc: cpufreq: Fix typo and outdated line
2011-11-08 10:23:29 +01:00
cpuidle
cpuidle: Add Documentation
2008-02-14 00:16:13 -05:00
cris
fix random typos
2008-10-16 11:21:30 -07:00
crypto
async_tx: add support for asynchronous RAID6 recovery operations
2009-08-29 19:09:27 -07:00
development-process
Documentation: Update stable address
2011-12-12 14:14:31 -08:00
device-mapper
dm log userspace: fix comment hyphens
2011-10-31 20:21:22 +00:00
devicetree
doc: dt: Fix broken reference in gpio-leds documentation
2012-02-27 10:28:04 -06:00
DocBook
docbook: fix fatal errors in device-drivers docbook and add DMA Management section
2012-02-01 17:28:26 -08:00
driver-model
Documentation: devres: add allocation functions to list of supported calls
2012-01-24 10:47:42 -08:00
dvb
[media] dvb_get_firmware: updates for it913x
2011-12-11 09:00:48 -02:00
early-userspace
Documentation: Remove last references to BitKeeper.
2008-04-21 22:19:05 +00:00
fault-injection
fault-injection: update documentation with the mmc module param
2011-10-26 16:32:13 -04:00
fb
fbdev: Add FOURCC-based format configuration API
2011-12-19 20:07:13 +00:00
filesystems
Merge branch 'for-3.3' of git://linux-nfs.org/~bfields/linux
2012-01-14 12:26:41 -08:00
firmware_class
firmware: Update hotplug script
2010-08-05 13:53:34 -07:00
frv
doc: fix broken references
2011-09-27 18:08:04 +02:00
hid
HID: Move hiddev.txt to the new Documentation/hid directory
2011-03-22 11:43:51 +01:00
hwmon
hwmon: (jc42) Add support for AT30TS00, TS3000GB2, TSE2002GB2, and MCP9804
2012-03-07 09:48:44 -08:00
i2c
i2c: Fix device name for 10-bit slave address
2011-11-23 11:33:07 +01:00
i2o
doc: i2o: fix typo 'Settting'
2011-06-07 16:06:01 +02:00
ia64
Fix common misspellings
2011-03-31 11:26:23 -03:00
ide
ide: preserve Host Protected Area by default (v2)
2009-06-07 13:52:52 +02:00
infiniband
Documentation: update broken web addresses.
2010-08-04 15:21:40 +02:00
input
Input: ALPS - fix touchpad detection when buttons are pressed
2012-02-24 00:46:45 -08:00
ioctl
NVMe: New driver
2011-11-04 15:52:51 -04:00
isdn
doc: fix wrong arch/i386 references
2011-06-13 13:43:05 +02:00
ja_JP
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2011-07-25 23:06:24 -07:00
kbuild
kbuild: Add support for an "archheaders" target
2011-11-17 13:35:20 -08:00
kdump
[S390] Add s390x description to Documentation/kdump/kdump.txt
2011-12-27 11:27:13 +01:00
ko_KR
Docs/Kconfig: Update: osdl.org -> linuxfoundation.org
2010-11-15 23:50:13 +01:00
laptops
Documentation: thinkpad-acpi grammo fixes
2011-11-04 12:01:47 -07:00
leds
Documentation: fix leds-class.txt duplicated word
2011-11-04 12:01:48 -07:00
m68k
Documentation: add pointer to name_to_dev_t for root= values
2011-08-03 14:25:21 -10:00
make
kbuild: introduce HDR_ARCH_LIST for headers_install_all
2010-12-14 22:16:19 +01:00
mips
Fix common misspellings
2011-03-31 11:26:23 -03:00
misc-devices
Fix common misspellings
2011-03-31 11:26:23 -03:00
mmc
mmc: core: Fixup delayed work clock gating patch
2012-01-11 23:58:43 -05:00
mn10300
trivial: Miscellaneous documentation typo fixes
2009-06-12 18:01:47 +02:00
mtd
Documentation: update broken web addresses.
2010-08-04 15:21:40 +02:00
namespaces
The namespaces compatibility list doc
2007-11-29 09:24:53 -08:00
netlabel
Documentation/: it's -> its where appropriate
2010-04-23 02:09:52 +02:00
networking
bonding: document undocumented active_slave sysfs entry.
2011-12-26 20:09:35 -05:00
nfc
NFC: Driver for NXP Semiconductors PN544 NFC chip.
2011-01-13 08:03:19 -08:00
parisc
…
PCI
doc: fix broken references
2011-09-27 18:08:04 +02:00
pcmcia
pcmcia: use autoconfiguration feature for ioports and iomem
2010-09-29 17:20:24 +02:00
power
PM / Documentation: Fix minor issue in freezing_of_tasks.txt
2012-01-19 23:22:49 +01:00
powerpc
Fix common misspellings
2011-03-31 11:26:23 -03:00
pps
pps: add parallel port PPS signal generator
2011-01-13 08:03:21 -08:00
prctl
generic, x86: add tests for prctl PR_GET_TSC and PR_SET_TSC
2008-04-19 19:19:55 +02:00
pti
Kernel documentation for the PTI feature.
2011-05-13 16:31:00 -07:00
ptp
ptp: Added a brand new class driver for ptp clocks.
2011-05-23 13:01:00 -07:00
rapidio
RapidIO: documentation update
2011-11-02 16:07:02 -07:00
RCU
docs: Additional LWN links to RCU API
2011-12-11 10:32:23 -08:00
s390
[S390] Remove Kerntypes leftovers
2011-12-27 11:27:12 +01:00
scheduler
sched: Add documentation for bandwidth control
2011-08-14 12:03:58 +02:00
scsi
[SCSI] qla4xxx: Update license
2012-01-16 12:34:12 +04:00
security
Merge branch 'master'; commit 'v3.2-rc2' into next
2011-11-16 12:39:48 +11:00
serial
serial/documentation: fix documented name of DCD cpp symbol
2012-01-04 16:26:32 -08:00
sh
sh: clkfwk: Kill off unused clk_set_rate_ex().
2010-11-15 18:25:12 +09:00
sound
Merge branch 'topic/hda' into for-linus
2012-01-12 09:59:18 +01:00
sparc
sparc: Remove Documentation/sparc/sbus_drivers.txt
2008-08-29 02:15:25 -07:00
spi
doc: fix broken references
2011-09-27 18:08:04 +02:00
sysctl
Documentation: add missing tainted bits to Documentation/sysctl/kernel.txt
2012-02-06 16:29:19 -08:00
target
target: tcm_mod_builder: small fixups
2011-12-14 11:38:25 +00:00
telephony
Fix common misspellings
2011-03-31 11:26:23 -03:00
thermal
thermal: Rename generate_netlink_event
2012-01-23 03:15:25 -05:00
timers
doc: fix broken references
2011-09-27 18:08:04 +02:00
trace
mm-tracepoint: fix documentation and examples
2012-01-10 16:30:41 -08:00
usb
USB: update documentation for usbmon
2012-01-04 16:04:30 -08:00
vDSO
Document the vDSO and add a reference parser
2011-07-14 17:57:09 -07:00
video4linux
[media] V4L2 Spec: fix extended control documentation
2012-01-16 09:37:53 -02:00
virtual
lguest: remove reference from Documentation/virtual/00-INDEX
2012-01-28 08:10:23 +10:30
vm
slub: document setting min order with debug_guardpage_minorder > 0
2012-01-12 20:13:04 -08:00
w1
Fix common misspellings
2011-03-31 11:26:23 -03:00
watchdog
watchdog: documentation: describe nowayout in coversion-guide
2012-01-06 15:26:14 +01:00
wimax
i2400m: documentation and instructions for usage
2009-01-07 10:00:18 -08:00
x86
x86-64, doc: Remove int 0xcc from entry_64.S documentation
2011-08-16 08:04:08 -07:00
zh_CN
remove the messy code file Documentation/zh_CN/SubmitChecklist
2011-09-26 16:18:41 -07:00
.gitignore
add random binaries to .gitignore
2010-04-08 11:34:34 +02:00
00-INDEX
Documentation: add Ramoops usage description
2011-08-13 18:34:03 -07:00
applying-patches.txt
…
atomic_ops.txt
doc: Add load/store guarantees to Documentation/atomic-ops.txt
2011-12-11 10:31:58 -08:00
bad_memory.txt
Document handling of bad memory
2008-12-03 16:09:53 -07:00
basic_profiling.txt
…
binfmt_misc.txt
Documentation: update broken web addresses.
2010-08-04 15:21:40 +02:00
braille-console.txt
trivial: Miscellaneous documentation typo fixes
2009-06-12 18:01:47 +02:00
bt8xxgpio.txt
gpio: add bt8xxgpio driver
2008-07-25 10:53:30 -07:00
btmrvl.txt
Bluetooth: Add documentation for Marvell Bluetooth driver
2009-08-22 14:25:32 -07:00
BUG-HUNTING
Documentation: add hint about call traces & module symbols to BUG-HUNTING
2008-02-06 10:41:09 -08:00
bus-virt-phys-mapping.txt
doc: fix broken references
2011-09-27 18:08:04 +02:00
cachetlb.txt
mm: convert mm->cpu_vm_cpumask into cpumask_var_t
2011-05-25 08:39:21 -07:00
Changes
Documentation/Changes: remove some really obsolete text
2011-07-11 16:48:38 -07:00
circular-buffers.txt
Document Linux's circular buffering capabilities
2010-03-24 16:31:22 -07:00
coccinelle.txt
coccinelle.txt: update documentation to include M= option
2012-01-14 22:25:56 +01:00
CodingStyle
Documentation: update CodingStyle use of braces
2011-11-04 12:01:47 -07:00
cpu-hotplug.txt
Fix common misspellings
2011-03-31 11:26:23 -03:00
cpu-load.txt
[PATCH] Documentation: CPU load calculation description
2007-03-01 14:53:39 -08:00
cputopology.txt
topology/sysfs: Provide book id and siblings attributes
2010-09-09 20:41:25 +02:00
dcdbas.txt
…
debugging-modules.txt
Documentation: Clarify when module debugging actually works.
2008-02-03 15:27:38 +02:00
debugging-via-ohci1394.txt
ieee1394: update URLs in debugging-via-ohci1394.txt
2009-10-03 09:28:11 +02:00
dell_rbu.txt
Fix common misspellings
2011-03-31 11:26:23 -03:00
devices.txt
vhost-net: add module alias (v2.1)
2012-01-13 10:12:23 -08:00
digsig.txt
crypto: digital signature verification support
2011-11-09 12:10:37 +02:00
DMA-API-HOWTO.txt
Documentation/DMA-API-HOWTO.txt: fix misleading example
2011-07-26 16:49:45 -07:00
DMA-API.txt
include/linux/dma-mapping.h: add dma_zalloc_coherent()
2011-11-02 16:07:02 -07:00
DMA-attributes.txt
powerpc/cell: Add DMA_ATTR_WEAK_ORDERING dma attribute and use in Cell IOMMU code
2008-07-22 10:39:36 +10:00
dma-buf-sharing.txt
dma-buf: Documentation update for Kconfig select
2012-01-13 10:27:33 +00:00
DMA-ISA-LPC.txt
Fix typos in /Documentation : 'T''
2006-11-30 04:55:36 +01:00
dmaengine.txt
DMAEngine: Define interleaved transfer request api
2011-11-18 12:16:24 +05:30
dontdiff
[S390] Remove Kerntypes leftovers
2011-12-27 11:27:12 +01:00
dynamic-debug-howto.txt
Merge branch 'docs-next' of git://git.lwn.net/linux-2.6
2011-03-27 19:46:59 -07:00
edac.txt
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
2011-04-07 11:14:49 -07:00
eisa.txt
Fix common misspellings
2011-03-31 11:26:23 -03:00
email-clients.txt
Documentation: email-clients: Add better Thunderbird information
2011-08-13 18:34:03 -07:00
feature-removal-schedule.txt
ARM: at91: code removal of CAP9 SoC
2012-02-03 13:33:05 +01:00
flexible-arrays.txt
flex_array: flex_array_prealloc takes a number of elements, not an end
2011-04-28 16:12:47 -04:00
futex-requeue-pi.txt
futex: add requeue-pi documentation
2009-05-09 07:12:50 +02:00
gcov.txt
trivial: fix typo in CONFIG_DEBUG_FS in gcov doc
2009-09-21 15:14:56 +02:00
gpio.txt
Revert "gpiolib: annotate gpio-intialization with __must_check"
2011-01-13 17:26:46 -08:00
highuid.txt
[SPARC]: Remove SunOS and Solaris binary support.
2008-04-21 15:10:15 -07:00
HOWTO
Documentation: Update stable address
2011-12-12 14:14:31 -08:00
hw_random.txt
hw_random doc updates
2008-03-24 19:22:19 -07:00
hwspinlock.txt
hwspinlock/core: register a bank of hwspinlocks in a single API call
2011-09-21 19:45:34 +03:00
init.txt
init/main.c: improve usability in case of init binary failure
2010-03-06 11:26:29 -08:00
initrd.txt
use the newc archive format as requested by initramfs
2008-02-03 14:54:41 +02:00
intel_txt.txt
Documentation: update broken web addresses.
2010-08-04 15:21:40 +02:00
Intel-IOMMU.txt
intel-iommu: Kill DMAR_BROKEN_GFX_WA option.
2009-09-19 09:37:23 -07:00
io_ordering.txt
…
io-mapping.txt
io mapping: improve documentation
2008-11-03 18:21:44 +01:00
iostats.txt
Documentation/iostats.txt: bit-size reference etc.
2011-03-23 20:44:18 +01:00
IPMI.txt
IPMI: Add the document description of ipmi_get_smi_info
2010-12-14 00:22:00 -05:00
IRQ-affinity.txt
bitmap, irq: add smp_affinity_list interface to /proc/irq
2011-05-25 08:39:45 -07:00
IRQ.txt
[PATCH] genirq: irq: document what an IRQ is
2006-06-29 10:26:25 -07:00
irqflags-tracing.txt
Fix common misspellings
2011-03-31 11:26:23 -03:00
isapnp.txt
…
java.txt
Documentation/java.txt: typo and grammar fixes
2007-10-20 02:37:21 +02:00
kernel-doc-nano-HOWTO.txt
docbook: warn on unused doc entries
2010-09-11 16:49:21 -07:00
kernel-docs.txt
doc: fix broken references
2011-09-27 18:08:04 +02:00
kernel-parameters.txt
kmsg_dump: don't run on non-error paths by default
2012-03-05 15:49:42 -08:00
kmemcheck.txt
kmemcheck: update documentation
2009-07-01 22:36:22 +02:00
kmemleak.txt
kmemleak: Handle percpu memory allocation
2011-12-02 16:12:42 +00:00
kobject.txt
kobject: documentation: Update to refer to kset-example.c.
2010-03-19 07:12:20 -07:00
kprobes.txt
tree-wide: fix comment/printk typos
2010-11-01 15:38:34 -04:00
kref.txt
kref: Fix typo in kref documentation
2011-03-07 13:20:05 -08:00
ldm.txt
Documentation: update broken web addresses.
2010-08-04 15:21:40 +02:00
local_ops.txt
trivial: Miscellaneous documentation typo fixes
2009-06-12 18:01:47 +02:00
lockdep-design.txt
lockdep: Update documentation for lock-class leak detection
2011-12-11 10:31:23 -08:00
lockstat.txt
Documentation: Add statistics about nested locks
2011-05-28 17:03:29 +02:00
logo.gif
Revert "linux.conf.au 2009: Tuz"
2009-04-27 12:00:27 -07:00
logo.txt
Revert "linux.conf.au 2009: Tuz"
2009-04-27 12:00:27 -07:00
magic-number.txt
doc: fix wrong arch/i386 references
2011-06-13 13:43:05 +02:00
Makefile
[media] Remove the old V4L1 v4lgrab.c file
2010-12-29 08:17:12 -02:00
ManagementStyle
docs: fix ManagementStyle book name
2008-10-30 11:38:46 -07:00
mca.txt
doc: fix wrong arch/i386 references
2011-06-13 13:43:05 +02:00
md.txt
md: create externally visible flags for supporting hot-replace.
2011-12-23 10:17:51 +11:00
media-framework.txt
doc: fix broken references
2011-09-27 18:08:04 +02:00
memory-barriers.txt
doc: fix broken references
2011-09-27 18:08:04 +02:00
memory-hotplug.txt
memory hotplug: Allow memory blocks to span multiple memory sections
2011-02-03 16:08:57 -08:00
memory.txt
Documentation/memory.txt: remove some very outdated recommendations
2009-09-22 07:17:26 -07:00
mono.txt
Fix "can not" in Documentation and Kconfig
2006-10-03 22:53:09 +02:00
mutex-design.txt
mutex: Fix annotations to include it in kernel-locking docbook
2010-09-03 08:19:51 +02:00
nmi_watchdog.txt
x86, nmi-watchdog: update procfs nmi_watchdog file documentation v2
2008-10-30 19:07:04 +01:00
nommu-mmap.txt
nommu: fix malloc performance by adding uninitialized flag
2009-12-15 08:53:24 -08:00
numastat.txt
mm: fix NUMA accounting in numastat.txt
2009-09-22 07:17:39 -07:00
oops-tracing.txt
module,bug: Add TAINT_OOT_MODULE flag for modules not built in-tree
2011-11-07 07:54:42 +10:30
padata.txt
Documentation/padata.txt: fix typos etc.
2010-08-11 08:59:18 -07:00
parport-lowlevel.txt
plip: fix parport_register_device name parameter
2007-11-26 19:39:01 -08:00
parport.txt
…
pi-futex.txt
fix a typo in Documentation/pi-futex.txt
2006-10-03 23:39:02 +02:00
pinctrl.txt
pinctrl: fix some pinmux typos
2012-01-26 14:11:31 +01:00
pnp.txt
doc: capitalization and other minor fixes in pnp doc
2010-02-05 12:22:44 +01:00
preempt-locking.txt
…
printk-formats.txt
Documentation: update printk-formats.txt
2011-06-15 21:52:50 -07:00
prio_tree.txt
Documentation: remove duplicated words
2006-10-03 22:57:56 +02:00
ramoops.txt
Documentation: add Ramoops usage description
2011-08-13 18:34:03 -07:00
rbtree.txt
Documentation: Update augmented rbtree documentation
2011-07-24 10:03:05 -07:00
rfkill.txt
doc: fix broken references
2011-09-27 18:08:04 +02:00
robust-futex-ABI.txt
futex: documentation: fix inconsistent description of futex list_op_pending
2009-06-18 13:03:56 -07:00
robust-futexes.txt
Fix typos in /Documentation : Misc
2006-11-30 05:21:10 +01:00
rt-mutex-design.txt
variable name fix to Documentation/rt-mutex-design.txt
2010-06-05 17:39:09 +02:00
rt-mutex.txt
[PATCH] pi-futex: rt mutex docs
2006-06-27 17:32:47 -07:00
rtc.txt
RTC: Fix up rtc.txt documentation to reflect changes to generic rtc layer
2011-03-09 11:25:10 -08:00
SAK.txt
Remove Andrew Morton's old email accounts
2008-10-16 11:21:32 -07:00
SecurityBugs
Fix common misspellings
2011-03-31 11:26:23 -03:00
serial-console.txt
…
sgi-ioc4.txt
…
sgi-visws.txt
…
SM501.txt
trivial: Miscellaneous documentation typo fixes
2009-06-12 18:01:47 +02:00
sparse.txt
update email address
2010-07-19 10:56:54 +02:00
spinlocks.txt
Documentation/spinlocks.txt: Remove reference to sti()/cli()
2011-07-11 12:45:04 -07:00
stable_api_nonsense.txt
doc: stable_api_nonsense.txt: fix paragraph to make more sense.
2011-03-30 12:02:05 +02:00
stable_kernel_rules.txt
stable: update documentation to ask for kernel version
2012-01-24 10:50:22 -08:00
SubmitChecklist
Documentation/SubmitChecklist: add RCU debug config options
2011-07-25 20:57:17 -07:00
SubmittingDrivers
Documentation: SubmittingDrivers: fix Linus's git tree URL
2011-08-13 18:34:03 -07:00
SubmittingPatches
Documentation: fix spelling error in SubmittingPatches
2011-08-13 18:34:02 -07:00
svga.txt
…
sysfs-rules.txt
Fix typos in comments
2010-03-16 11:47:56 +01:00
sysrq.txt
documentation: update sysrq.txt magic sysrq keys
2010-10-26 17:32:41 -07:00
unaligned-memory-access.txt
introduce HAVE_EFFICIENT_UNALIGNED_ACCESS Kconfig symbol
2008-07-25 10:53:27 -07:00
unicode.txt
…
unshare.txt
Documentation: remove duplicated words
2006-10-03 22:57:56 +02:00
VGA-softcursor.txt
…
vgaarbiter.txt
misc latin1 to utf8 conversions
2012-01-02 13:04:55 +01:00
video-output.txt
output: Add output class document
2006-12-20 01:46:58 -05:00
volatile-considered-harmful.txt
Documentation/volatile-considered-harmful.txt: correct cpu_relax() documentation
2010-03-24 16:31:20 -07:00
workqueue.txt
workqueue: Document debugging tricks
2011-03-31 13:40:42 +02:00
xz.txt
decompressors: add XZ decompressor module
2011-01-13 08:03:24 -08:00
zorro.txt
…