Browse Source

properly fix merge mess

Alex Bradbury 4 years ago
parent
commit
6b91775413
100 changed files with 0 additions and 1 deletions
  1. 0
    1
      modules/3.18.5-v7+/build
  2. BIN
      modules/3.18.5-v7+/kernel/arch/arm/crypto/aes-arm-bs.ko
  3. BIN
      modules/3.18.5-v7+/kernel/arch/arm/crypto/aes-arm.ko
  4. BIN
      modules/3.18.5-v7+/kernel/arch/arm/crypto/sha1-arm-neon.ko
  5. BIN
      modules/3.18.5-v7+/kernel/arch/arm/crypto/sha1-arm.ko
  6. BIN
      modules/3.18.5-v7+/kernel/arch/arm/crypto/sha512-arm-neon.ko
  7. BIN
      modules/3.18.5-v7+/kernel/arch/arm/lib/xor-neon.ko
  8. BIN
      modules/3.18.5-v7+/kernel/arch/arm/oprofile/oprofile.ko
  9. BIN
      modules/3.18.5-v7+/kernel/crypto/ablk_helper.ko
  10. BIN
      modules/3.18.5-v7+/kernel/crypto/arc4.ko
  11. BIN
      modules/3.18.5-v7+/kernel/crypto/async_tx/async_memcpy.ko
  12. BIN
      modules/3.18.5-v7+/kernel/crypto/async_tx/async_pq.ko
  13. BIN
      modules/3.18.5-v7+/kernel/crypto/async_tx/async_raid6_recov.ko
  14. BIN
      modules/3.18.5-v7+/kernel/crypto/async_tx/async_tx.ko
  15. BIN
      modules/3.18.5-v7+/kernel/crypto/async_tx/async_xor.ko
  16. BIN
      modules/3.18.5-v7+/kernel/crypto/authenc.ko
  17. BIN
      modules/3.18.5-v7+/kernel/crypto/authencesn.ko
  18. BIN
      modules/3.18.5-v7+/kernel/crypto/cast5_generic.ko
  19. BIN
      modules/3.18.5-v7+/kernel/crypto/cast_common.ko
  20. BIN
      modules/3.18.5-v7+/kernel/crypto/ccm.ko
  21. BIN
      modules/3.18.5-v7+/kernel/crypto/cmac.ko
  22. BIN
      modules/3.18.5-v7+/kernel/crypto/cryptd.ko
  23. BIN
      modules/3.18.5-v7+/kernel/crypto/crypto_null.ko
  24. BIN
      modules/3.18.5-v7+/kernel/crypto/crypto_user.ko
  25. BIN
      modules/3.18.5-v7+/kernel/crypto/ctr.ko
  26. BIN
      modules/3.18.5-v7+/kernel/crypto/cts.ko
  27. BIN
      modules/3.18.5-v7+/kernel/crypto/deflate.ko
  28. BIN
      modules/3.18.5-v7+/kernel/crypto/ecb.ko
  29. BIN
      modules/3.18.5-v7+/kernel/crypto/gf128mul.ko
  30. BIN
      modules/3.18.5-v7+/kernel/crypto/hmac.ko
  31. BIN
      modules/3.18.5-v7+/kernel/crypto/md4.ko
  32. BIN
      modules/3.18.5-v7+/kernel/crypto/md5.ko
  33. BIN
      modules/3.18.5-v7+/kernel/crypto/michael_mic.ko
  34. BIN
      modules/3.18.5-v7+/kernel/crypto/seqiv.ko
  35. BIN
      modules/3.18.5-v7+/kernel/crypto/sha1_generic.ko
  36. BIN
      modules/3.18.5-v7+/kernel/crypto/sha256_generic.ko
  37. BIN
      modules/3.18.5-v7+/kernel/crypto/sha512_generic.ko
  38. BIN
      modules/3.18.5-v7+/kernel/crypto/tgr192.ko
  39. BIN
      modules/3.18.5-v7+/kernel/crypto/wp512.ko
  40. BIN
      modules/3.18.5-v7+/kernel/crypto/xcbc.ko
  41. BIN
      modules/3.18.5-v7+/kernel/crypto/xor.ko
  42. BIN
      modules/3.18.5-v7+/kernel/crypto/xts.ko
  43. BIN
      modules/3.18.5-v7+/kernel/drivers/base/regmap/regmap-i2c.ko
  44. BIN
      modules/3.18.5-v7+/kernel/drivers/base/regmap/regmap-mmio.ko
  45. BIN
      modules/3.18.5-v7+/kernel/drivers/base/regmap/regmap-spi.ko
  46. BIN
      modules/3.18.5-v7+/kernel/drivers/bcma/bcma.ko
  47. BIN
      modules/3.18.5-v7+/kernel/drivers/block/cryptoloop.ko
  48. BIN
      modules/3.18.5-v7+/kernel/drivers/block/drbd/drbd.ko
  49. BIN
      modules/3.18.5-v7+/kernel/drivers/block/nbd.ko
  50. BIN
      modules/3.18.5-v7+/kernel/drivers/block/pktcdvd.ko
  51. BIN
      modules/3.18.5-v7+/kernel/drivers/bluetooth/ath3k.ko
  52. BIN
      modules/3.18.5-v7+/kernel/drivers/bluetooth/bcm203x.ko
  53. BIN
      modules/3.18.5-v7+/kernel/drivers/bluetooth/bfusb.ko
  54. BIN
      modules/3.18.5-v7+/kernel/drivers/bluetooth/bpa10x.ko
  55. BIN
      modules/3.18.5-v7+/kernel/drivers/bluetooth/btmrvl.ko
  56. BIN
      modules/3.18.5-v7+/kernel/drivers/bluetooth/btmrvl_sdio.ko
  57. BIN
      modules/3.18.5-v7+/kernel/drivers/bluetooth/btusb.ko
  58. BIN
      modules/3.18.5-v7+/kernel/drivers/bluetooth/btwilink.ko
  59. BIN
      modules/3.18.5-v7+/kernel/drivers/bluetooth/hci_vhci.ko
  60. BIN
      modules/3.18.5-v7+/kernel/drivers/cdrom/cdrom.ko
  61. BIN
      modules/3.18.5-v7+/kernel/drivers/char/hw_random/bcm2708-rng.ko
  62. BIN
      modules/3.18.5-v7+/kernel/drivers/connector/cn.ko
  63. BIN
      modules/3.18.5-v7+/kernel/drivers/cpufreq/cpufreq_stats.ko
  64. BIN
      modules/3.18.5-v7+/kernel/drivers/extcon/extcon-arizona.ko
  65. BIN
      modules/3.18.5-v7+/kernel/drivers/extcon/extcon-class.ko
  66. BIN
      modules/3.18.5-v7+/kernel/drivers/gpio/gpio-arizona.ko
  67. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-a4tech.ko
  68. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-apple.ko
  69. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-axff.ko
  70. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-belkin.ko
  71. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-cherry.ko
  72. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-chicony.ko
  73. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-cypress.ko
  74. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-dr.ko
  75. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-elecom.ko
  76. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-elo.ko
  77. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-emsff.ko
  78. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-ezkey.ko
  79. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-gaff.ko
  80. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-gyration.ko
  81. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-holtek-kbd.ko
  82. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-holtek-mouse.ko
  83. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-holtekff.ko
  84. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-kensington.ko
  85. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-keytouch.ko
  86. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-kye.ko
  87. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-lcpower.ko
  88. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-logitech.ko
  89. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-magicmouse.ko
  90. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-microsoft.ko
  91. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-monterey.ko
  92. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-multitouch.ko
  93. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-ntrig.ko
  94. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-ortek.ko
  95. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-petalynx.ko
  96. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-picolcd.ko
  97. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-pl.ko
  98. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-roccat-arvo.ko
  99. BIN
      modules/3.18.5-v7+/kernel/drivers/hid/hid-roccat-common.ko
  100. 0
    0
      modules/3.18.5-v7+/kernel/drivers/hid/hid-roccat-isku.ko

+ 0
- 1
modules/3.18.5-v7+/build View File

@@ -1 +0,0 @@
1
-/home/dc4/projects/linux7

BIN
modules/3.18.5-v7+/kernel/arch/arm/crypto/aes-arm-bs.ko View File


BIN
modules/3.18.5-v7+/kernel/arch/arm/crypto/aes-arm.ko View File


BIN
modules/3.18.5-v7+/kernel/arch/arm/crypto/sha1-arm-neon.ko View File


BIN
modules/3.18.5-v7+/kernel/arch/arm/crypto/sha1-arm.ko View File


BIN
modules/3.18.5-v7+/kernel/arch/arm/crypto/sha512-arm-neon.ko View File


BIN
modules/3.18.5-v7+/kernel/arch/arm/lib/xor-neon.ko View File


BIN
modules/3.18.5-v7+/kernel/arch/arm/oprofile/oprofile.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/ablk_helper.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/arc4.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/async_tx/async_memcpy.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/async_tx/async_pq.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/async_tx/async_raid6_recov.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/async_tx/async_tx.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/async_tx/async_xor.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/authenc.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/authencesn.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/cast5_generic.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/cast_common.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/ccm.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/cmac.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/cryptd.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/crypto_null.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/crypto_user.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/ctr.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/cts.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/deflate.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/ecb.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/gf128mul.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/hmac.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/md4.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/md5.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/michael_mic.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/seqiv.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/sha1_generic.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/sha256_generic.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/sha512_generic.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/tgr192.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/wp512.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/xcbc.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/xor.ko View File


BIN
modules/3.18.5-v7+/kernel/crypto/xts.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/base/regmap/regmap-i2c.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/base/regmap/regmap-mmio.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/base/regmap/regmap-spi.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/bcma/bcma.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/block/cryptoloop.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/block/drbd/drbd.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/block/nbd.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/block/pktcdvd.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/bluetooth/ath3k.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/bluetooth/bcm203x.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/bluetooth/bfusb.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/bluetooth/bpa10x.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/bluetooth/btmrvl.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/bluetooth/btmrvl_sdio.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/bluetooth/btusb.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/bluetooth/btwilink.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/bluetooth/hci_vhci.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/cdrom/cdrom.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/char/hw_random/bcm2708-rng.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/connector/cn.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/cpufreq/cpufreq_stats.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/extcon/extcon-arizona.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/extcon/extcon-class.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/gpio/gpio-arizona.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-a4tech.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-apple.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-axff.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-belkin.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-cherry.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-chicony.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-cypress.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-dr.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-elecom.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-elo.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-emsff.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-ezkey.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-gaff.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-gyration.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-holtek-kbd.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-holtek-mouse.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-holtekff.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-kensington.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-keytouch.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-kye.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-lcpower.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-logitech.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-magicmouse.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-microsoft.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-monterey.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-multitouch.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-ntrig.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-ortek.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-petalynx.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-picolcd.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-pl.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-roccat-arvo.ko View File


BIN
modules/3.18.5-v7+/kernel/drivers/hid/hid-roccat-common.ko View File


+ 0
- 0
modules/3.18.5-v7+/kernel/drivers/hid/hid-roccat-isku.ko View File


Some files were not shown because too many files changed in this diff