diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-06-11 00:07:47 +0200 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-06-11 00:07:47 +0200 |
| commit | 4e73e0eb633f8a1b5cbf20e7f42c6dbfec1d1ca7 (patch) | |
| tree | 0cea46e43f0625244c3d06a71d6559e5ec5419ca /arch/um/drivers/ssl.h | |
| parent | xfs: prevent deadlock in xfs_qm_shake() (diff) | |
| parent | Linux 2.6.30 (diff) | |
| download | linux-4e73e0eb633f8a1b5cbf20e7f42c6dbfec1d1ca7.tar.xz linux-4e73e0eb633f8a1b5cbf20e7f42c6dbfec1d1ca7.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/um/drivers/ssl.h')
| -rw-r--r-- | arch/um/drivers/ssl.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/um/drivers/ssl.h b/arch/um/drivers/ssl.h index 98412aa66607..314d17725ce6 100644 --- a/arch/um/drivers/ssl.h +++ b/arch/um/drivers/ssl.h @@ -11,13 +11,3 @@ extern void ssl_receive_char(int line, char ch); #endif -/* - * Overrides for Emacs so that we follow Linus's tabbing style. - * Emacs will notice this stuff at the end of the file and automatically - * adjust the settings for this buffer only. This must remain at the end - * of the file. - * --------------------------------------------------------------------------- - * Local variables: - * c-file-style: "linux" - * End: - */ |