diff options
| author | Richard Yao <ryao@gentoo.org> | 2013-03-17 12:50:36 -0400 |
|---|---|---|
| committer | Richard Yao <ryao@cs.stonybrook.edu> | 2013-03-17 12:50:36 -0400 |
| commit | 788245436d3c9e3fbc84285d60f3b4c40e18c207 (patch) | |
| tree | 2983d000a6b91e6c6f0877fadc14b47df5e0adee /keymaps-force-release | |
| parent | 15cad0e19bc6e79fe70b23b1b0f076ab23d4d7a4 (diff) | |
| parent | 261132097e647d259c851b32c3c5798fa13cc67a (diff) | |
Merge remote-tracking branch 'origin/follow-upstream'
Signed-off-by: Richard Yao <ryao@gentoo.org>
Diffstat (limited to 'keymaps-force-release')
| -rw-r--r-- | keymaps-force-release/Makefile.am | 2 | ||||
| -rw-r--r-- | keymaps-force-release/samsung-series-9 (renamed from keymaps-force-release/samsung-90x3a) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/keymaps-force-release/Makefile.am b/keymaps-force-release/Makefile.am index 1c4fb51499..8abd627014 100644 --- a/keymaps-force-release/Makefile.am +++ b/keymaps-force-release/Makefile.am @@ -5,5 +5,5 @@ dist_udevkeymapforcere_DATA = \ dell-xps \ hp-other \ samsung-other \ - samsung-90x3a \ + samsung-series-9 \ common-volume-keys diff --git a/keymaps-force-release/samsung-90x3a b/keymaps-force-release/samsung-series-9 index 65707effb7..65707effb7 100644 --- a/keymaps-force-release/samsung-90x3a +++ b/keymaps-force-release/samsung-series-9 |