summaryrefslogtreecommitdiffstats
path: root/firmware/WHENCE
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2008-10-20 04:17:52 +0200
committerPaul Mundt <lethal@linux-sh.org>2008-10-20 04:17:52 +0200
commit4cb40f795af36b3deb743f6ccf6c3fd542c61c8d (patch)
treedb3d7519932549bf528f5b8e4cb8350356cd544d /firmware/WHENCE
parentMerge branch 'sh/gpiolib' (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff)
downloadlinux-4cb40f795af36b3deb743f6ccf6c3fd542c61c8d.tar.xz
linux-4cb40f795af36b3deb743f6ccf6c3fd542c61c8d.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: Documentation/kernel-parameters.txt arch/sh/include/asm/elf.h
Diffstat (limited to 'firmware/WHENCE')
-rw-r--r--firmware/WHENCE10
1 files changed, 10 insertions, 0 deletions
diff --git a/firmware/WHENCE b/firmware/WHENCE
index 66c51b275e9e..57002cdecd42 100644
--- a/firmware/WHENCE
+++ b/firmware/WHENCE
@@ -339,3 +339,13 @@ Licence: Allegedly GPLv2+, but no source visible. Marked:
Found in hex form in kernel source.
--------------------------------------------------------------------------
+
+Driver: CASSINI - Sun Cassini
+
+File: sun/cassini.bin
+
+Licence: Unknown
+
+Found in hex form in kernel source.
+
+--------------------------------------------------------------------------