Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db583168 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branches 'for-3.11/battery', 'for-3.11/elo', 'for-3.11/holtek' and...

Merge branches 'for-3.11/battery', 'for-3.11/elo', 'for-3.11/holtek' and 'for-3.11/i2c-hid-fixed' into for-linus
Loading
Loading
Loading
Loading
+9 −3
Original line number Diff line number Diff line
@@ -319,7 +319,10 @@ cache<0..n>
  Symlink to each of the cache devices comprising this cache set. 

cache_available_percent
  Percentage of cache device free.
  Percentage of cache device which doesn't contain dirty data, and could
  potentially be used for writeback.  This doesn't mean this space isn't used
  for clean cached data; the unused statistic (in priority_stats) is typically
  much lower.

clear_stats
  Clears the statistics associated with this cache
@@ -423,8 +426,11 @@ nbuckets
  Total buckets in this cache

priority_stats
  Statistics about how recently data in the cache has been accessed.  This can
  reveal your working set size.
  Statistics about how recently data in the cache has been accessed.
  This can reveal your working set size.  Unused is the percentage of
  the cache that doesn't contain any data.  Metadata is bcache's
  metadata overhead.  Average is the average priority of cache buckets.
  Next is a list of quantiles with the priority threshold of each.

written
  Sum of all data that has been written to the cache; comparison with
+2 −6
Original line number Diff line number Diff line
@@ -498,12 +498,8 @@ Your cooperation is appreciated.

		Each device type has 5 bits (32 minors).

 13 block	8-bit MFM/RLL/IDE controller
		  0 = /dev/xda		First XT disk whole disk
		 64 = /dev/xdb		Second XT disk whole disk

		Partitions are handled in the same way as IDE disks
		(see major number 3).
 13 block	Previously used for the XT disk (/dev/xdN)
		Deleted in kernel v3.9.

 14 char	Open Sound System (OSS)
		  0 = /dev/mixer	Mixer control
+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ Required properties:
- compatible: Should be "cdns,[<chip>-]{macb|gem}"
  Use "cdns,at91sam9260-macb" Atmel at91sam9260 and at91sam9263 SoCs.
  Use "cdns,at32ap7000-macb" for other 10/100 usage or use the generic form: "cdns,macb".
  Use "cnds,pc302-gem" for Picochip picoXcell pc302 and later devices based on
  Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on
  the Cadence GEM, or the generic form: "cdns,gem".
- reg: Address and length of the register set for the device
- interrupts: Should contain macb interrupt
+1 −1
Original line number Diff line number Diff line
Atmel AT91RM9200 Real Time Clock

Required properties:
- compatible: should be: "atmel,at91rm9200-rtc"
- compatible: should be: "atmel,at91rm9200-rtc" or "atmel,at91sam9x5-rtc"
- reg: physical base address of the controller and length of memory mapped
  region.
- interrupts: rtc alarm/event interrupt
Loading